Skip to content

Commit a8ce1d5

Browse files
author
Goran Mekić
committedSep 21, 2015
Sanatize CSS
1 parent 70ea991 commit a8ce1d5

File tree

9 files changed

+101
-104
lines changed

9 files changed

+101
-104
lines changed
 

‎app/js/components/Menu.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var Menu = React.createClass({
77
<a href="#">Day</a>
88
<a href="#" className="active">Week</a>
99
<a href="#">Month</a>
10-
<a href="#navigation" className="navigation-menu active">Nav</a>
10+
<a href="#navigation" className="navigation-menu active">Todo</a>
1111
</div>
1212
);
1313
}

‎app/sass/_menu.scss

-28
This file was deleted.

‎app/sass/components/_body.scss

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
html, body{
2+
height: 100%;
3+
}
4+
5+
body {
6+
background: #aaa;
7+
background: linear-gradient(#aaa, #555);
8+
}
9+
10+
.text--small {
11+
font-size: 80%;
12+
}
13+
14+
.day {
15+
display: inline-block;
16+
text-align: center;
17+
border-right: 1px solid #444;
18+
}
19+
20+
.day:last-child {
21+
border-right: none;
22+
}
23+
24+
.day-name {
25+
height: $flarior-dayname-height;
26+
display: inline-block;
27+
}
28+
29+
.content {
30+
height: calc(100vh - #{$flarior-breadcrumb-lineheight} - #{$flarior-title-height});
31+
}
32+
33+
.hour {
34+
height: calc((100vh - #{$flarior-breadcrumb-lineheight} - #{$flarior-title-height} - #{$flarior-dayname-height}) / 24);
35+
border-top: 1px solid #aaa;
36+
}
37+
38+
.day-of-month {
39+
font-size: 80%;
40+
}
41+
42+
.text--right {
43+
text-align: right !important;
44+
}
45+
46+
.text--center {
47+
text-align: center !important;
48+
}
49+
50+
.text--justify {
51+
text-align: justify;
52+
}

‎app/sass/components/_menu.scss

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
.breadcrumb {
2+
display: inline-block;
3+
box-shadow: 0 0 15px 1px rgba(0, 0, 0, 0.35);
4+
background: $flarior-menu-first-color;
5+
background: linear-gradient($flarior-menu-first-color, $flarior-menu-second-color);
6+
width: 100%;
7+
}
8+
9+
.breadcrumb a {
10+
text-decoration: none;
11+
outline: none;
12+
display: block;
13+
float: left;
14+
font-size: 12px;
15+
line-height: $flarior-breadcrumb-lineheight;
16+
color: #c66;
17+
padding: 0 20px 0 20px;
18+
position: relative;
19+
}
20+
21+
.breadcrumb a.active, .breadcrumb a:hover{
22+
background: $flarior-menu-second-color;
23+
background: linear-gradient($flarior-menu-second-color, #000);
24+
}
25+
.breadcrumb a.active:after, .breadcrumb a:hover:after {
26+
background: $flarior-menu-second-color;
27+
background: linear-gradient(135deg, $flarior-menu-second-color, $flarior-menu-third-color);
28+
}

‎app/sass/_navigation.scss ‎app/sass/components/_navigation.scss

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
.navigation a {
2121
text-decoration: none;
22+
color: red;
2223
}
2324

2425
.navigation-menu {

‎app/sass/_title.scss ‎app/sass/components/_title.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.title {
22
box-shadow: 0 0 15px 1px rgba(0, 0, 0, 0.35);
3-
background: #333;
4-
background: linear-gradient(#333, #000);
3+
background: $flarior-title-first-color;
4+
background: linear-gradient($flarior-title-first-color, $flarior-title-second-color);
55
line-height: 15px;
6-
height: 36px;
6+
height: $flarior-title-height;
77
}
88

99
.title--item {

‎app/sass/settings/_defaults.scss

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
$flarior-breadcrumb-lineheight: 36px;
2+
3+
$flarior-menu-first-color: #666;
4+
$flarior-menu-second-color: #333;
5+
$flarior-menu-third-color: #000;
6+
7+
$flarior-title-height: 36px;
8+
$flarior-title-first-color: #333;
9+
$flarior-title-second-color: #000;
10+
11+
$flarior-dayname-height: 25px;

‎app/sass/style.scss

+5-46
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SETTINGS
22
@import "bower_components/inuit-defaults/settings.defaults";
33
@import "bower_components/inuit-responsive-settings/settings.responsive";
4+
@import "settings/defaults.scss";
45

56

67
// TOOLS
@@ -26,55 +27,13 @@
2627

2728

2829
// COMPONENTS (Custom stuff)
30+
@import "components/menu";
31+
@import "components/title";
32+
@import "components/navigation";
33+
@import "components/body";
2934

3035
// TRUMPS
3136
@import "bower_components/inuit-widths/trumps.widths";
3237
@import "bower_components/inuit-spacing/trumps.spacing";
3338
@import "bower_components/inuit-widths-responsive/trumps.widths-responsive";
3439
@import "bower_components/inuit-spacing-responsive/trumps.spacing-responsive";
35-
@import "trumps/defaults";
36-
37-
@import "menu";
38-
@import "title";
39-
@import "navigation";
40-
41-
html, body{
42-
height: 100%;
43-
}
44-
45-
body {
46-
background: #aaa;
47-
background: linear-gradient(#aaa, #555);
48-
}
49-
50-
.text--small {
51-
font-size: 80%;
52-
}
53-
54-
.day {
55-
display: inline-block;
56-
text-align: center;
57-
border-right: 1px solid #444;
58-
}
59-
60-
.day:last-child {
61-
border-right: none;
62-
}
63-
64-
.day-name {
65-
height: 25px;
66-
display: inline-block;
67-
}
68-
69-
.content {
70-
height: calc(100vh - 36px - 36px);
71-
}
72-
73-
.hour {
74-
height: calc((100vh - 25px - 36px - 36px) / 24);
75-
border-top: 1px solid #aaa;
76-
}
77-
78-
.day-of-month {
79-
font-size: 80%;
80-
}

‎app/sass/trumps/_defaults.scss

-26
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.