Skip to content

Commit

Permalink
Merge branch 'johngruen-ui-changes'
Browse files Browse the repository at this point in the history
  • Loading branch information
whd committed Dec 4, 2014
2 parents f0d023e + 3a876a5 commit e3a0e1f
Show file tree
Hide file tree
Showing 17 changed files with 7,694 additions and 707 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "bower_components"
}
37 changes: 37 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
module.exports = function(grunt) {

grunt.initConfig({
less: {
main: {
files: {
'application_styles/main.css':'application_styles/main.less'
}
},
bootstrap: {
files: {
'board/static/css/lib/bootstrap.css':'bower_components/bootstrap/less/bootstrap.less'
}
}
},
copy: {
bootstrapVars: {
src: 'application_styles/variables.less',
dest: 'bower_components/bootstrap/less/variables.less'
}
},
autoprefixer: {
dist: {
files: {
'board/static/css/main.css':'application_styles/main.css'
}
}
}
});

grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-autoprefixer');

grunt.registerTask('css',['copy','less','autoprefixer']);

};
109 changes: 109 additions & 0 deletions application_styles/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
html,
body {
font-family: 'Fira Sans', sans-serif;
}
h1,
h2,
h3,
h4,
h4,
h6 {
font-wieght: 400 !important;
}
.jumbotron {
padding: 10px 0;
}
.jumbotron a {
text-decoration: none;
color: #424f5a;
}
#services-table {
background: #fff;
border: 1px solid #c1c1c1;
}
#services-table td,
#services-table th {
font-size: 18px;
padding: 10px !important;
border: 1px solid #c1c1c1;
}
#event-log h2 {
padding: 20px;
background: white;
border: 1px solid #c1c1c1;
margin: 0;
}
#event-log .event {
margin-left: 20px;
padding: 20px;
border-left: 1px solid #c1c1c1;
position: relative;
}
#event-log .event:before {
content: '';
display: block;
width: 15px;
height: 15px;
border-radius: 50%;
position: absolute;
left: -8px;
top: 22px !important;
}
#event-log .event.null:before {
background: #c1c1c1;
border: 1px solid #424f5a;
}
#event-log .event.danger {
border: 1px solid #c1c1c1;
background: #fff;
padding: 20px;
}
#event-log .event.danger h3,
#event-log .event.danger h6,
#event-log .event.danger p {
font-weight: 300;
margin: 10px;
}
#event-log .event.danger:before {
background: #d74345;
}
.service-status {
padding: 20px;
color: #fff;
}
.service-status h3,
.service-status p {
margin: 5px 0;
}
.service-status.null {
background: #74bf43;
}
.service-status.down {
background: #d74345;
}
.white-box {
background: #fff;
padding: 20px;
}
.metric {
margin: 0 auto;
}
#metrics-area {
margin: 50px 0;
padding: 20px 0;
background: #fff;
}
.footer {
margin: 50px 0 0 0;
padding: 50px 0;
background: #424f5a;
color: #c1c1c1;
}
.footer ul {
list-style: none;
padding: 0;
margin: 0;
}
.footer a {
color: #f8f8f8;
}
116 changes: 116 additions & 0 deletions application_styles/main.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
@import "variables.less";

html, body {
font-family: 'Fira Sans',sans-serif;
}

h1,h2,h3,h4,h4,h6 {
font-wieght: 400 !important;
}

.jumbotron {
padding: 10px 0;
a {
text-decoration: none;
color: @gray-dark;
}
}

#services-table {
background: #fff;
border: 1px solid @gray;
td,
th {
font-size: 18px;
padding: 10px !important;
border: 1px solid @gray;
}
}

#event-log {
h2 {
padding: 20px;
background: white;
border: 1px solid @gray;
margin:0;
}
.event {
margin-left: 20px;
padding: 20px;
border-left: 1px solid @gray;
position: relative;
&:before {
content: '';
display: block;
width: 15px;
height: 15px;
border-radius: 50%;
position: absolute;
left: -8px;
top: 22px !important;
}
&.null{
&:before {
background: @gray;
border: 1px solid @gray-dark;
}
}
&.danger{
border: 1px solid @gray;
h3,h6,p {
font-weight: 300;
margin: 10px;
}
background: #fff;
padding: 20px;
&:before {
background: @brand-danger;
}
}
}
}

.service-status {
padding: 20px;
color: #fff;
h3,p {
margin: 5px 0;
}
&.null {
background: @brand-success;
}
&.down {
background: @brand-danger;
}
}

.white-box {
background: #fff;
padding: 20px;
}

.metric {
margin: 0 auto;
}

#metrics-area {
margin: 50px 0;
padding: 20px 0;
background: #fff;
}


.footer {
margin: 50px 0 0 0;
padding: 50px 0;
background: @gray-dark;
color: @gray;
ul {
list-style: none;
padding: 0;
margin: 0;
}
a {
color: @gray-light;
}
}
Loading

0 comments on commit e3a0e1f

Please sign in to comment.