Skip to content

Commit ee75ed5

Browse files
just3wsjust3ws
committed
Merge pull request coderwall#94 from seuros/mongo_grave
Styles
2 parents f872117 + 4ae35ae commit ee75ed5

23 files changed

+1380
-1193
lines changed

‎Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
3333
# HTML
3434
gem 'haml', '3.1.7'
3535
gem 'hamlbars', '1.1.0' #haml support for handlebars/ember.js
36+
gem 'slim-rails'
3637

3738
# Postgres
3839
gem 'pg'

‎Gemfile.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,14 @@ GEM
611611
rack (~> 1.4)
612612
rack-protection (~> 1.4)
613613
tilt (~> 1.3, >= 1.3.4)
614+
slim (2.0.3)
615+
temple (~> 0.6.6)
616+
tilt (>= 1.3.3, < 2.1)
617+
slim-rails (2.1.5)
618+
actionpack (>= 3.0, < 4.2)
619+
activesupport (>= 3.0, < 4.2)
620+
railties (>= 3.0, < 4.2)
621+
slim (~> 2.0)
614622
slop (3.6.0)
615623
split (0.7.2)
616624
redis (>= 2.1)
@@ -636,6 +644,7 @@ GEM
636644
railties (~> 3.0)
637645
subexec (0.2.3)
638646
syntax (1.2.0)
647+
temple (0.6.8)
639648
thor (0.19.1)
640649
thread_safe (0.3.4)
641650
tilt (1.4.1)
@@ -787,6 +796,7 @@ DEPENDENCIES
787796
simple_form
788797
simplecov
789798
sinatra
799+
slim-rails
790800
split
791801
spring
792802
spring-commands-rspec

‎app/assets/stylesheets/admin.css.scss

Lines changed: 188 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,191 @@
1-
@import "base";
2-
@import "compass/css3/";
1+
@import "base","compass";
2+
// VARIABLES
3+
//Widgets
4+
$widget-green: $green;
5+
$widget-blue: $light-blue;
6+
$widget-purple: #663399; //Rebecca purple DONT CHANGE THIS.
7+
$widget-orange: $orange;
8+
$widget-red: $red;
9+
$widget-grey: $mid-grey;
10+
11+
body#admin {
12+
table {
13+
&.stats {
14+
width: 40%;
15+
thead {
16+
font-size: 2em;
17+
}
18+
tbody {
19+
tr {
20+
td {
21+
&:first-child {
22+
font-size: 1.5em;
23+
}
24+
}
25+
&.heading td {
26+
font-size: 2em;
27+
text-align: center;
28+
height: 30px;
29+
}
30+
.goodday {
31+
color: green;
32+
a:link, a:visited {
33+
color: green;
34+
}
35+
}
36+
.badday {
37+
color: red;
38+
a:link, a:visited {
39+
color: red;
40+
}
41+
}
42+
}
43+
}
44+
}
45+
}
46+
h4 a {
47+
color: $light-blue;
48+
text-decoration: underline;
49+
}
50+
table {
51+
margin-bottom: 30px;
52+
}
53+
.stats, .sections {
54+
thead td {
55+
font-size: 0.8em;
56+
}
57+
tr {
58+
border-bottom: solid 1px $light-blue-grey;
59+
}
60+
.heading {
61+
border: 0;
62+
}
63+
td {
64+
font-size: 1.5em;
65+
padding: 10px;
66+
a {
67+
color: $light-blue;
68+
}
69+
}
70+
}
71+
.comment-admin {
72+
li {
73+
float: left;
74+
}
75+
.titles {
76+
margin-bottom: 15px;
77+
li {
78+
font-family: "MuseoSans-500";
79+
font-size: 1.5em;
80+
&:nth-child(1) {
81+
width: 60px;
82+
}
83+
&:nth-child(2) {
84+
width: 60px;
85+
}
86+
}
87+
}
88+
.comments-list {
89+
li {
90+
font-size: 1.3em;
91+
margin-bottom: 10px;
92+
a {
93+
color: $light-blue;
94+
}
95+
&:nth-child(1) {
96+
width: 60px;
97+
}
98+
&:nth-child(2) {
99+
width: 60px;
100+
}
101+
&:nth-child(3) {
102+
width: 560px;
103+
}
104+
}
105+
}
106+
}
107+
108+
.widget-row {
109+
width: 100%;
110+
}
111+
112+
113+
.widget {
114+
&.green {
115+
border: 1px solid $widget-green;
116+
header {
117+
background: $widget-green;
118+
}
119+
}
120+
&.blue {
121+
border: 1px solid $widget-blue;
122+
header {
123+
background: $widget-blue;
124+
}
125+
}
126+
&.purple {
127+
border: 1px solid $widget-purple;
128+
header {
129+
background: $widget-purple;
130+
}
131+
}
132+
&.orange {
133+
border: 1px solid $widget-orange;
134+
header {
135+
background: $widget-orange;
136+
}
137+
}
138+
&.red {
139+
border: 1px solid $widget-red;
140+
header {
141+
background: $widget-red;
142+
}
143+
}
144+
width: 48%;
145+
background: #fff;
146+
margin: 0 5px 20px;
147+
border: 1px solid $widget-grey ;
148+
float: left;
149+
150+
header {
151+
background: $widget-grey;
152+
height: 36px;
153+
> h4 {
154+
float: left;
155+
font-size: 14px;
156+
font-weight: normal;
157+
padding: 10px 11px 10px 15px;
158+
line-height: 12px;
159+
margin: 0;
160+
i {
161+
font-size: 14px;
162+
margin-right: 2px;
163+
}
164+
}
165+
}
166+
.body {
167+
padding: 15px 15px;
168+
}
169+
}
170+
#links-bar
171+
{
172+
ul {
173+
margin: 0 auto;
174+
text-align: center;
175+
}
176+
177+
li {
178+
margin: 10px;
179+
display: inline-block;
180+
vertical-align: top;
181+
}
182+
i{
183+
color: $green;
184+
font-size:2em;
185+
margin-right: 5px;
186+
}
187+
}
188+
}
3189

4190
ul.alerts {
5191
li {

‎app/assets/stylesheets/application.scss

Lines changed: 1 addition & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,42 +1515,7 @@ body#blog {
15151515
}
15161516
}
15171517

1518-
#admin {
1519-
table {
1520-
&.stats {
1521-
width: 40%;
1522-
thead {
1523-
font-size: 2em;
1524-
}
1525-
tbody {
1526-
tr {
1527-
td {
1528-
&:first-child {
1529-
font-size: 1.5em;
1530-
}
1531-
}
1532-
&.heading td {
1533-
font-size: 2em;
1534-
text-align: center;
1535-
height: 30px;
1536-
}
1537-
.goodday {
1538-
color: green;
1539-
a:link, a:visited {
1540-
color: green;
1541-
}
1542-
}
1543-
.badday {
1544-
color: red;
1545-
a:link, a:visited {
1546-
color: red;
1547-
}
1548-
}
1549-
}
1550-
}
1551-
}
1552-
}
1553-
}
1518+
15541519

15551520
input[type=file].safari5-upload-hack {
15561521
min-width: 100%;
@@ -1919,71 +1884,6 @@ input[type=file].safari5-upload-hack {
19191884
/*phone media query end*/
19201885
}
19211886

1922-
/*new-home-template body end*/
1923-
body#admin {
1924-
h4 a {
1925-
color: $light-blue;
1926-
text-decoration: underline;
1927-
}
1928-
table {
1929-
margin-bottom: 30px;
1930-
}
1931-
.stats, .sections {
1932-
thead td {
1933-
font-size: 0.8em;
1934-
}
1935-
tr {
1936-
border-bottom: solid 1px $light-blue-grey;
1937-
}
1938-
.heading {
1939-
border: 0;
1940-
}
1941-
td {
1942-
font-size: 1.5em;
1943-
padding: 10px;
1944-
a {
1945-
color: $light-blue;
1946-
}
1947-
}
1948-
}
1949-
.comment-admin {
1950-
li {
1951-
float: left;
1952-
}
1953-
.titles {
1954-
margin-bottom: 15px;
1955-
li {
1956-
font-family: "MuseoSans-500";
1957-
font-size: 1.5em;
1958-
&:nth-child(1) {
1959-
width: 60px;
1960-
}
1961-
&:nth-child(2) {
1962-
width: 60px;
1963-
}
1964-
}
1965-
}
1966-
.comments-list {
1967-
li {
1968-
font-size: 1.3em;
1969-
margin-bottom: 10px;
1970-
a {
1971-
color: $light-blue;
1972-
}
1973-
&:nth-child(1) {
1974-
width: 60px;
1975-
}
1976-
&:nth-child(2) {
1977-
width: 60px;
1978-
}
1979-
&:nth-child(3) {
1980-
width: 560px;
1981-
}
1982-
}
1983-
}
1984-
}
1985-
}
1986-
19871887
.analytics {
19881888
background: #fff;
19891889
@include border-radius(6px);

‎app/assets/stylesheets/dashboard.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import "base";
2-
@import "compass/css3/";
2+
@import "compass/css3";
33

44
//Activity feed
55
body#activity {

‎app/assets/stylesheets/featured-teams.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import "base";
2-
@import "compass/css3/";
2+
@import "compass/css3";
33

44
//featured teams grid
55
#featured-team-grid {

0 commit comments

Comments
 (0)