Skip to content

Commit

Permalink
layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jogga
Jogga committed Jan 21, 2013
1 parent 26d540a commit c462695
Show file tree
Hide file tree
Showing 18 changed files with 234 additions and 166 deletions.
5 changes: 4 additions & 1 deletion source/css/style.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@
"style/account",
"style/login",
"style/flash",
"style/search"
"style/search",
"style/project-overview",
"style/single-task",
"style/createUpdate"
;
49 changes: 49 additions & 0 deletions source/css/style/_createupdate.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

.createUpdate {
@include rounded(2px);
margin: .5em 1.5%;
padding: 1.5%;
background-color: $os-white;
h1 {
font-size: $nav-head;
font-weight: normal;
}
label, input {
display: block;
}
fieldset {
margin-bottom: 1em;
}
input[type="text"], input[type="date"], textarea {
background-color: $os-lightgrey;
// border: 1px solid $os-mediumgrey;
border: none;
width: 97%;
padding: 8px 1.5%;
height: 31px;
}
.duedate, .hours {
width: 48.5%;
float: left;
}
.duedate {
margin-right: 3%;
}
button {
text-transform: lowercase;
font-weight: normal;
font-family: $os-sans;
padding: 8px 2em 8px 1em;
font-size: 1em;
img{
margin-right: 1em;
}
@include rounded(2px);
}
.btn-cancel {
background-color: $os-red;
}
.btn-submit {
background-color: $os-blue;
}
}
12 changes: 9 additions & 3 deletions source/css/style/_list.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ul{
width:97%;
margin: 0 1.5%;
padding: 8px 0px;
// @include rounded(5px);
@include rounded(2px);
background-color: $os-blue;
color: $os-white;
line-height:31px;
Expand Down Expand Up @@ -48,6 +48,9 @@ ul{
padding-right: 1.5%;
width: 69.75%;
}
&:active{
background-color: $os-mediumblack;
}
}

.list {
Expand All @@ -61,8 +64,9 @@ ul{

/* Kopfzeile der Liste */
.list-head{
// @include rounded-differently (5px, 5px, 0, 0);
@include rounded-differently (2px, 2px, 0, 0);
margin:0;
// border: 1px solid $os-mediumgrey;
border-bottom: 1px solid $os-lightgrey;
background-color: $os-white;
color: $os-blue;
Expand Down Expand Up @@ -126,7 +130,9 @@ ul{
.record-list {
padding: 8px 0;
background-color: $os-white;
// @include rounded-differently (0, 0, 5px, 5px);
@include rounded-differently (0, 0, 2px, 2px);
// border: 1px solid $os-mediumgrey;
// border-top: none;
li {
&:last-child{
background-color: red;
Expand Down
35 changes: 17 additions & 18 deletions source/css/style/_navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@
}
}
.button-left{
// border-right: 1px solid $os-lightgrey;
// border-right: 1px solid $os-mediumgrey;
text-align:center;
display: block;
float:left;
height: 31px;
width: 9.125%;
padding-left: 3%;
padding-left: 1.5%;
padding-right: 1.5%;
&:active{
background-color: $os-mediumgrey;
}
}
.button-center{
font-family: $os-sans;
Expand All @@ -35,21 +38,29 @@
line-height: 31px;
padding-left: 1.5%;
padding-right: 1.5%;
//width: 69.75%;
&:active{
background-color: $os-mediumgrey;
}

}
.button-right{
// border-left: 1px solid $os-lightgrey;
// border-left: 1px solid $os-mediumgrey;
text-align:center;
display: block;
float: right;
height: 31px;
width: 9.125%;
padding-right: 3%;
padding-right: 1.5%;
padding-left: 1.5%;
&:active{
background-color: $os-mediumgrey;
}
}
.active {
background-color: $os-mediumgrey;
background-image: url(../images/active.png);
background-repeat: no-repeat;
background-position: 50% 100%;
background-color: $os-lightgrey;
}
}

Expand All @@ -68,25 +79,15 @@
padding: 8px 0;
height: 15px;
}
&:active{
background-color: $os-blue;
}
}
.tools-button {
color: $os-black;
&:active{
background-color: $os-blue;
}
}
.context-button{
border-color: $os-black;
img {
padding: 8px 0;
height: 15px;
}
&:active{
background-color: $os-blue;
}
}
}

Expand All @@ -96,7 +97,6 @@
top:0px;
background-color: $os-lightgrey;
.home-button{
border-color: $os-lightgrey;
img {
margin-top: -2px;
}
Expand All @@ -106,7 +106,6 @@
color: $os-red;
}
.search-button {
border-color: $os-lightgrey;
}

}
106 changes: 53 additions & 53 deletions source/css/style/_new-project.scss
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
.new-project {
margin:0;
padding:0 0 2em 0;
background-color: $os-white;
h1{
margin:0;
padding:8px 0 8px 15.125% ;
font-family: $os-serif;
font-size: $nav-head;
font-weight: normal;
}
fieldset{
margin: 1em 3% 1em 15.125%;
}
label, input[type="text"], input[type="date"], textarea{
display:block;
width: 100%;
}
input[type="text"], input[type="date"], textarea{
margin-left: -1.5%;
padding: 8px 1.5%;
background-color: $os-lightgrey;
border:none;
// @include insetshadow( 1px, 2px);
}
label {
font-size: .9em;
}
button{
font-weight:bold;
text-transform:uppercase;
font-size: .7em;
border:none;
color: $os-white;
background-color: $os-black;
padding: 10px 20px;
@include rounded( 5px);
// @include shadow( 1px, 3px);
&:hover{
background-color:$os-black;
}
&:active{
background-color:$os-black;
}
}
.btn-cancel{
margin-left: -1.5%;
background-color: $os-red;
// .new-project {
// margin:0;
// padding:0 0 2em 0;
// background-color: $os-white;
// h1{
// margin:0;
// padding:8px 0 8px 15.125% ;
// font-family: $os-serif;
// font-size: $nav-head;
// font-weight: normal;
// }
// fieldset{
// margin: 1em 3% 1em 15.125%;
// }
// label, input[type="text"], input[type="date"], textarea{
// display:block;
// width: 100%;
// }
// input[type="text"], input[type="date"], textarea{
// margin-left: -1.5%;
// padding: 8px 1.5%;
// background-color: $os-lightgrey;
// border:none;
// // @include insetshadow( 1px, 2px);
// }
// label {
// font-size: .9em;
// }
// button{
// font-weight:bold;
// text-transform:uppercase;
// font-size: .7em;
// border:none;
// color: $os-white;
// background-color: $os-black;
// padding: 10px 20px;
// @include rounded( 5px);
// // @include shadow( 1px, 3px);
// &:hover{
// background-color:$os-black;
// }
// &:active{
// background-color:$os-black;
// }
// }
// .btn-cancel{
// margin-left: -1.5%;
// background-color: $os-red;

}
.btn-submit{
background-color: $os-blue;
}
}
// }
// .btn-submit{
// background-color: $os-blue;
// }
// }
5 changes: 5 additions & 0 deletions source/css/style/_project-overview.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.project-details{
margin: .5em 1.5%;
padding: 1.5%;
background-color: $os-white;
}
14 changes: 5 additions & 9 deletions source/css/style/_search.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@
padding-top: 47px;
}
.search-nav{
opacity: .9;
margin: 0 1.5%;
background-color: $os-mediumgrey;
position: fixed;
top: 47px;
width: 83.375%;
padding: 7px 0 8px 13.625%;
height: 31px;
input[type=text]{
width: 97%;
@include rounded(2px);
width: 86.375%;
padding: 7px 0 8px 13.625%;
height: 31px;
font-family: $os-sans;
color: $os-black;
border: none;

padding: 8px 1.5%;
margin-bottom: 4px;
height: 15px;
background-color: $os-mediumgrey;
}
}
7 changes: 7 additions & 0 deletions source/css/style/_single-task.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.singletask {
.task-details {
background-color: $os-white;
margin: .5em 1.5%;
padding: 1.5%;
}
}
6 changes: 4 additions & 2 deletions source/css/style/_tools.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.tools{
// width: 100%;
@include rounded(2px);
padding: 0;
margin: 0 1.5%;
ul {
list-style-type: none;
margin: 0;
Expand All @@ -10,7 +12,7 @@
text-transform: lowercase;
height: 31px;
line-height:31px;
padding: 8px 0 8px 15.125%;
padding: 8px 0 8px 13.625%;
font-family: $os-sans;
font-size: $nav-head;
cursor: pointer;
Expand Down
Binary file added source/images/active.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/icon-accept.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/icon-cancel.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion source/js/app/view/projects.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ App.ProjectOverviewView = Ember.View.extend({
App.CreateUpdateProjectView = Ember.View.extend({
tagName: "form",
templateName: 'createUpdateProject',
classNames: ['new-project']
classNames: ['new-project', 'createUpdate']
});
2 changes: 1 addition & 1 deletion source/js/app/view/tasks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ App.CreateUpdateTaskView = Ember.View.extend({
tagName: "form",
templateName: 'createUpdateTask',
attributeBindings: ['placeholder'],
classNames: ['createUpdateTask'],
classNames: ['createUpdateTask', 'createUpdate'],
});
Loading

0 comments on commit c462695

Please sign in to comment.