Skip to content

Styles #94

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
merged 1 commit into from
Jul 21, 2014
Merged

Styles #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
# HTML
gem 'haml', '3.1.7'
gem 'hamlbars', '1.1.0' #haml support for handlebars/ember.js
gem 'slim-rails'

# Postgres
gem 'pg'
Expand Down
10 changes: 10 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,14 @@ GEM
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slim-rails (2.1.5)
actionpack (>= 3.0, < 4.2)
activesupport (>= 3.0, < 4.2)
railties (>= 3.0, < 4.2)
slim (~> 2.0)
slop (3.6.0)
split (0.7.2)
redis (>= 2.1)
Expand All @@ -636,6 +644,7 @@ GEM
railties (~> 3.0)
subexec (0.2.3)
syntax (1.2.0)
temple (0.6.8)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
Expand Down Expand Up @@ -787,6 +796,7 @@ DEPENDENCIES
simple_form
simplecov
sinatra
slim-rails
split
spring
spring-commands-rspec
Expand Down
190 changes: 188 additions & 2 deletions app/assets/stylesheets/admin.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,191 @@
@import "base";
@import "compass/css3/";
@import "base","compass";
// VARIABLES
//Widgets
$widget-green: $green;
$widget-blue: $light-blue;
$widget-purple: #663399; //Rebecca purple DONT CHANGE THIS.
$widget-orange: $orange;
$widget-red: $red;
$widget-grey: $mid-grey;

body#admin {
table {
&.stats {
width: 40%;
thead {
font-size: 2em;
}
tbody {
tr {
td {
&:first-child {
font-size: 1.5em;
}
}
&.heading td {
font-size: 2em;
text-align: center;
height: 30px;
}
.goodday {
color: green;
a:link, a:visited {
color: green;
}
}
.badday {
color: red;
a:link, a:visited {
color: red;
}
}
}
}
}
}
h4 a {
color: $light-blue;
text-decoration: underline;
}
table {
margin-bottom: 30px;
}
.stats, .sections {
thead td {
font-size: 0.8em;
}
tr {
border-bottom: solid 1px $light-blue-grey;
}
.heading {
border: 0;
}
td {
font-size: 1.5em;
padding: 10px;
a {
color: $light-blue;
}
}
}
.comment-admin {
li {
float: left;
}
.titles {
margin-bottom: 15px;
li {
font-family: "MuseoSans-500";
font-size: 1.5em;
&:nth-child(1) {
width: 60px;
}
&:nth-child(2) {
width: 60px;
}
}
}
.comments-list {
li {
font-size: 1.3em;
margin-bottom: 10px;
a {
color: $light-blue;
}
&:nth-child(1) {
width: 60px;
}
&:nth-child(2) {
width: 60px;
}
&:nth-child(3) {
width: 560px;
}
}
}
}

.widget-row {
width: 100%;
}


.widget {
&.green {
border: 1px solid $widget-green;
header {
background: $widget-green;
}
}
&.blue {
border: 1px solid $widget-blue;
header {
background: $widget-blue;
}
}
&.purple {
border: 1px solid $widget-purple;
header {
background: $widget-purple;
}
}
&.orange {
border: 1px solid $widget-orange;
header {
background: $widget-orange;
}
}
&.red {
border: 1px solid $widget-red;
header {
background: $widget-red;
}
}
width: 48%;
background: #fff;
margin: 0 5px 20px;
border: 1px solid $widget-grey ;
float: left;

header {
background: $widget-grey;
height: 36px;
> h4 {
float: left;
font-size: 14px;
font-weight: normal;
padding: 10px 11px 10px 15px;
line-height: 12px;
margin: 0;
i {
font-size: 14px;
margin-right: 2px;
}
}
}
.body {
padding: 15px 15px;
}
}
#links-bar
{
ul {
margin: 0 auto;
text-align: center;
}

li {
margin: 10px;
display: inline-block;
vertical-align: top;
}
i{
color: $green;
font-size:2em;
margin-right: 5px;
}
}
}

ul.alerts {
li {
Expand Down
102 changes: 1 addition & 101 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,42 +1515,7 @@ body#blog {
}
}

#admin {
table {
&.stats {
width: 40%;
thead {
font-size: 2em;
}
tbody {
tr {
td {
&:first-child {
font-size: 1.5em;
}
}
&.heading td {
font-size: 2em;
text-align: center;
height: 30px;
}
.goodday {
color: green;
a:link, a:visited {
color: green;
}
}
.badday {
color: red;
a:link, a:visited {
color: red;
}
}
}
}
}
}
}


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

/*new-home-template body end*/
body#admin {
h4 a {
color: $light-blue;
text-decoration: underline;
}
table {
margin-bottom: 30px;
}
.stats, .sections {
thead td {
font-size: 0.8em;
}
tr {
border-bottom: solid 1px $light-blue-grey;
}
.heading {
border: 0;
}
td {
font-size: 1.5em;
padding: 10px;
a {
color: $light-blue;
}
}
}
.comment-admin {
li {
float: left;
}
.titles {
margin-bottom: 15px;
li {
font-family: "MuseoSans-500";
font-size: 1.5em;
&:nth-child(1) {
width: 60px;
}
&:nth-child(2) {
width: 60px;
}
}
}
.comments-list {
li {
font-size: 1.3em;
margin-bottom: 10px;
a {
color: $light-blue;
}
&:nth-child(1) {
width: 60px;
}
&:nth-child(2) {
width: 60px;
}
&:nth-child(3) {
width: 560px;
}
}
}
}
}

.analytics {
background: #fff;
@include border-radius(6px);
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "base";
@import "compass/css3/";
@import "compass/css3";

//Activity feed
body#activity {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/featured-teams.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "base";
@import "compass/css3/";
@import "compass/css3";

//featured teams grid
#featured-team-grid {
Expand Down
Loading