Skip to content

fix 355 #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pwalsh merged 2 commits into from
Mar 7, 2014
Merged

fix 355 #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cd4dd7
fix 355
dovp Feb 7, 2014
234cd85
fix 166 - Home page design implementation
dovp Feb 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions openbudgets/apps/accounts/templates/accounts/partials/account_tools.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<div class="account{% if user.is_authenticated %} auth{% endif %}">
{% if user.is_authenticated %}
<div class="dead-area-catcher"></div>
<a class="avatar" href="{% url 'account_detail' user.uuid %}"><img src="{{ user.avatar }}" /></a>
<div class="name">
{{ user.first_name }}
Expand Down
7 changes: 1 addition & 6 deletions openbudgets/apps/pages/templates/pages/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'base.html' %}
{% extends 'newbase.html' %}
{% load i18n %}
{% load url from future %}

Expand All @@ -8,11 +8,6 @@

{% block content %}

<section id="text">

<h2>{{ app_name }}</h2>

</section>

{% endblock content %}

16 changes: 15 additions & 1 deletion openbudgets/commons/static/css/base_ltr.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Alef:400,700);

@import url(http://fonts.googleapis.com/earlyaccess/alefhebrew.css);
/*! based on and adapted from :::: normalize.css v2.1.2 | MIT License | git.io/normalize */
/* FOUNDATION */
Expand Down Expand Up @@ -1463,11 +1462,23 @@ input.valid {
/*******************/
/* ACCOUNT WIDGET */
/*******************/
.dead-area-catcher {
display: none;
position: absolute;
top: -30%;
right: 150%;
width: 100%;
height: 200%;
-webkit-transform: rotate(68deg);
-moz-transform: rotate(68deg);
transform: rotate(68deg);
}
.account {
position: relative;
text-align: center;
width: 54px;
padding-top: 1.25em;
z-index: 1;
}
.account.auth:hover {
background-color: #e8e8ed;
Expand Down Expand Up @@ -1517,6 +1528,9 @@ input.valid {
.account:hover .actions {
display: block;
}
.account.auth:hover .dead-area-catcher {
display: block;
}
/*******************/
/* FILTER WIDGET */
/*******************/
Expand Down
29 changes: 28 additions & 1 deletion openbudgets/commons/static/css/base_rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Alef:400,700);

@import url(http://fonts.googleapis.com/earlyaccess/alefhebrew.css);
/*! based on and adapted from :::: normalize.css v2.1.2 | MIT License | git.io/normalize */
/* FOUNDATION */
Expand Down Expand Up @@ -1606,11 +1605,23 @@ input.valid {
/*******************/
/* ACCOUNT WIDGET */
/*******************/
.dead-area-catcher {
display: none;
position: absolute;
top: -30%;
right: 150%;
width: 100%;
height: 200%;
-webkit-transform: rotate(68deg);
-moz-transform: rotate(68deg);
transform: rotate(68deg);
}
.account {
position: relative;
text-align: center;
width: 54px;
padding-top: 1.25em;
z-index: 1;
}
.account.auth:hover {
background-color: #e8e8ed;
Expand Down Expand Up @@ -1660,6 +1671,9 @@ input.valid {
.account:hover .actions {
display: block;
}
.account.auth:hover .dead-area-catcher {
display: block;
}
/*******************/
/* FILTER WIDGET */
/*******************/
Expand Down Expand Up @@ -1699,6 +1713,19 @@ input.valid {
bottom: auto;
left: 0;
}
.dead-area-catcher {
display: none;
position: absolute;
top: -30%;
left: 150%;
right: auto;
width: 100%;
height: 200%;
-webkit-transform: rotate(-68deg);
-moz-transform: rotate(-68deg);
transform: rotate(-68deg);
z-index: 1;
}
h1,
h2,
h3,
Expand Down
154 changes: 154 additions & 0 deletions openbudgets/commons/static/css/newbase_rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
@import url(http://fonts.googleapis.com/earlyaccess/alefhebrew.css);

a {
text-decoration: none;
}
p { margin:0 }
body{
background: #ebebeb;
margin: 0;
padding: 0;
position:relative;
}
#header{
background: white;
position: relative;
height: 100px;
}
#headerContent{
position:relative;
width:960px; height:80px;
background-image:url('/static/img/logo.png');
background-position: right;
background-repeat:no-repeat;
margin: auto;
top: 10px;
}

#LayersContent{
position:relative;
margin-top: 40px;
}
#Layer1 {
background-image:url('/static/img/background1.jpg');
position:relative; width:960px; height:320px;
margin: 0 auto;
font-family: "Alef Hebrew";
font-size:36px;
line-height: 34px;
color: #fff;
direction: rtl;
}
#Layer1Large {
position:relative;
right: 15px;
top: 15px;
}
#Layer1Small {
font-family: "Alef Hebrew";
font-size:18px;
line-height: 18px;
color: #fff;
position:relative;
top: 80px;
right: 15px;
}
#Layer2 {
position:relative; width:960px; height:220px;
margin: 30px auto;
}
#about {
position:relative;
width:300px; height:220px;
background: #fff;
background-image:url('/static/img/about.png');
background-repeat: no-repeat;
background-position:134px 30px;
float: left;
margin-right: 30px;
}
#about:hover{
position:relative;
background: #ebebeb;
outline: 1px solid #fff;
background-repeat: no-repeat;
background-image:url('/static/img/about.png');
background-position:134px 30px;
}
#compare {
position:relative;
width:300px; height:220px;
background: #fff;
background-image:url('/static/img/compare.png');
background-repeat: no-repeat;
background-position:120px 30px;
float: left;
margin-right: 30px;
}

#compare:hover{
background: #ebebeb;
border-width:8px;
background-repeat: no-repeat;
background-image:url('/static/img/compare.png');
background-position:120px 30px;
outline: 1px solid #fff;
}
#explore {
position:relative;
width:300px; height:220px;
background: #fff;
background-image:url('/static/img/sayar.png');
background-repeat: no-repeat;
background-position:119px 30px;
float: left;
}
#explore:hover{
background: #ebebeb;
border-width:8px;
background-repeat: no-repeat;
background-image:url('/static/img/sayar.png');
background-position:119px 30px;
outline: 1px solid #fff;
}

#linkwrapper{
float: left;
}

.buttuntitle{
font-family: "Alef Hebrew";
font-size:24px;
line-height: 48px;
color: #000000;
position:relative;
top: 100px;
direction: rtl;
text-align: center
}
.buttuncontent{
font-family: "Alef Hebrew";
font-size:16px;
line-height: 18px;
color: #999;
position:relative;
top: 100px;
direction: rtl;
text-align: center
}
.layerfooter {

}

footer {
position:relative; width:960px; height:20px;
margin: 30px auto;
font-family: "Alef Hebrew";
font-size:14px;
line-height: 16px;
color: #999;
direction: rtl;
position:relative;
}
footer p { display: inline }

15 changes: 15 additions & 0 deletions openbudgets/commons/static/css/partials/ltr/widgets.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,23 @@
/*******************/
/* ACCOUNT WIDGET */
/*******************/
.dead-area-catcher {
display: none;
position: absolute;
top: -30%;
right: 150%;
width: 100%;
height: 200%;
-webkit-transform: rotate(68deg);
-moz-transform: rotate(68deg);
transform: rotate(68deg);
}
.account {
position: relative;
text-align: center;
width: 54px;
padding-top: 1.25em;
z-index: 1;
}
.account.auth:hover {
background-color: #e8e8ed;
Expand Down Expand Up @@ -67,6 +79,9 @@
.account:hover .actions {
display: block;
}
.account.auth:hover .dead-area-catcher {
display: block;
}
/*******************/
/* FILTER WIDGET */
/*******************/
Expand Down
19 changes: 19 additions & 0 deletions openbudgets/commons/static/css/partials/ltr/widgets.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,32 @@
/*******************/
/* ACCOUNT WIDGET */
/*******************/
.dead-area-catcher {
display: none;
position: absolute;
top: -30%;
right: 150%;
width: 100%;
height: 200%;

-webkit-transform: rotate(68deg);
-moz-transform: rotate(68deg);
transform: rotate(68deg);
}

.account {
.position(relative);
.text-align(center);
.width(54px);
.padding-top(@unit-em * 1.25);
z-index: 1;


&.auth:hover {
.background-color(@grey-light);
}


a.login-link {
.color(@greyblue-light);
}
Expand Down Expand Up @@ -59,6 +74,10 @@
}
}

.account.auth:hover .dead-area-catcher {
display: block;
}


/*******************/
/* FILTER WIDGET */
Expand Down
Loading