Change units to px from em. Downsize all widths and font sizes

This commit is contained in:
Luke Barratt 2014-04-29 19:18:14 +01:00
parent fd73c12558
commit b709d11783
30 changed files with 292 additions and 283 deletions

View file

@ -2,7 +2,8 @@
Neat Overrides
*/
$max-width: em(1200);
$max-width: 1140px;
$gutter: em(20);
/*
Grid Debugging
@ -16,8 +17,8 @@ $max-width: em(1200);
Neat Breakpoints
*/
$medium-screen: em(640);
$large-screen: em(860);
$medium-screen: 640px;
$large-screen: 860px;
$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
$large-screen-up: new-breakpoint(min-width $large-screen 8);
@ -38,9 +39,9 @@ $header-font-family: $montserrat;
Sizes
*/
$base-font-size: 1em;
$base-font-size: 14px;
$base-line-height: $base-font-size * 1.5;
$base-border-radius: em(5);
$base-border-radius: 3px;
/*
Colours
@ -87,13 +88,13 @@ $flash-success: $green;
$flash-warning: $red;
$flash-error: #e56c69;
$input-font-size: em(16);
$input-font-size: $base-font-size;
$input-primary: white;
$input-secondary: $blue;
$input-text: #232323;
$input-border-width: em(2);
$input-border-width: 2px;
$input-border-colour: darken($light-gray, 10%);
$input-padding: em(11);
$input-padding: 9px;
$input-border-radius: $base-border-radius;
$button-primary: $blue;
@ -104,4 +105,4 @@ $button-text: white;
Shadows
*/
$content-shadow: 0px 5px 20px 0px rgba(0, 0, 0, 0.1);
$content-shadow: 0px 5px 15px 0px rgba(0, 0, 0, 0.15);

View file

@ -4,13 +4,13 @@
.breadcrumbs {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
a {
display: inline-block;
}
.fa {
margin: 0 em(10);
margin: 0 10px;
}
}

View file

@ -69,11 +69,11 @@
}
a.user {
margin-right: em(10);
margin-right: 10px;
}
a.team {
margin-left: em(10);
margin-left: 10px;
}
p {
@ -84,12 +84,12 @@
font-style: italic;
font-size: .9em;
color: $comment-detail-color;
margin-top: em(10);
margin-top: 10px;
}
.controls {
position: absolute;
top: - em(5);
top: - 5px;
right: 0;
}
}
@ -101,7 +101,7 @@
.comment-form {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
h1,
h5 {
@ -110,6 +110,6 @@
}
.fields {
margin-bottom: em(20);
margin-bottom: 20px;
}
}

View file

@ -4,7 +4,7 @@
.flash {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
font-weight: 600;
&.notice {
@ -44,18 +44,18 @@
div#errors {
@extend .flash.error;
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
strong {
@include span-columns(12);
margin-bottom: em(10);
margin-bottom: 10px;
}
ul.errors {
@include span-columns(12);
li {
margin-bottom: .5em;
margin-bottom: 0;
&:last-child {
margin-bottom: 0;

View file

@ -2,13 +2,15 @@
Forms
*/
$input-height: 35px;
form {
.inline {
float: left;
display: inline-block;
width: auto;
margin-bottom: em(20);
margin-bottom: 20px;
input {
margin-bottom: 0;
@ -18,8 +20,8 @@ form {
.fields {
> .field_with_errors:first-child,
> label {
padding: em(11) 0;
line-height: em(16);
padding: 9px 0;
line-height: $input-font-size;
}
> .field_with_errors {
@ -40,14 +42,15 @@ form {
}
.select-wrapper {
$select-padding: em(7);
$select-padding: 7px;
$select-height: $input-height - 4px;
border-radius: $input-border-radius;
background-color: $input-primary;
border: $input-border-colour solid $input-border-width;
position: relative;
display: inline-block;
margin-right: em(10);
margin-right: 10px;
float: left;
max-width: 100%;
@ -59,13 +62,13 @@ form {
display: block;
width: auto;
position: relative;
line-height: em(22);
line-height: $select-height/2 + 4px;
vertical-align: middle;
max-height: em(36);
max-height: $select-height;
margin-left: 0;
border: 0;
margin: 0;
padding: $select-padding em(50) $select-padding $input-padding;
padding: $select-padding ($select-height + 10) $select-padding $input-padding;
font-size: $input-font-size;
max-width: 100%;
@ -88,9 +91,9 @@ form {
top: 0;
right: 0;
text-align: center;
padding-top: em(6);
width: em(36);
height: em(32);
padding-top: 6px;
width: $select-height;
height: $select-height - 4px;
border-left: $input-border-width solid $input-border-colour;
color: $input-border-colour;
}
@ -119,7 +122,7 @@ form {
color: $input-text;
font-size: $input-font-size;
padding: 0 $input-padding;
height: em(40);
height: $input-height;
border: $input-border-colour solid $input-border-width;
&:hover {
@ -148,8 +151,8 @@ form {
.inputs label.checkbox,
> label.checkbox {
position: relative;
width: em(40);
height: em(40);
width: $input-height;
height: $input-height;
overflow: hidden;
&:before {
@ -157,8 +160,8 @@ form {
content: "";
display: block;
border-radius: $input-border-radius;
width: em(40);
height: em(40);
width: $input-height;
height: $input-height;
padding: $input-padding;
background-color: $input-primary;
border: $input-border-colour solid $input-border-width;
@ -196,7 +199,7 @@ form {
}
.controls {
margin-bottom: em(20);
margin-bottom: 20px;
button,
input[type=submit] {
@ -204,6 +207,7 @@ form {
border-radius: $input-border-radius;
border: $input-border-width solid $button-primary;
margin-bottom: 0;
line-height: 30px;
outline: none;
}
}
@ -211,11 +215,11 @@ form {
form.square {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
.horizontal {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
&.small {
@include span-columns(6);
@ -233,11 +237,11 @@ form.square {
> label,
> .label {
@include span-columns(3);
padding: em(11) 0;
line-height: em(16);
padding: 9px 0;
line-height: $input-font-size;
&.checkbox {
width: em(40);
width: $input-height;
padding: 0;
}
}

View file

@ -20,7 +20,7 @@
@include span-columns(6);
i {
margin-right: em(10);
margin-right: 10px;
}
}
@ -30,7 +30,7 @@
text-align: right;
i {
margin-left: em(10);
margin-left: 10px;
}
}
@ -38,17 +38,17 @@
@include span-columns(12);
.timestamp {
margin: 0 em(5) em(5);
margin: 0 5px 5px;
}
}
.new-shout {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
.shout_input {
width: em(400);
margin-right: em(20);
width: 400px;
margin-right: 20px;
}
.fields,
@ -61,14 +61,14 @@
#gather-info {
@include span-columns(12);
margin: em(20) 0;
border-bottom: em(2) solid $light-gray;
margin: 20px 0;
border-bottom: 2px solid $light-gray;
.info {
@include span-columns(4);
h6 {
margin-bottom: em(10);
margin-bottom: 10px;
}
&:nth-child(3) {
@ -80,13 +80,13 @@
list-style-type: disc;
li {
margin-left: em(20);
margin-left: 20px;
}
}
.hide {
@include span-columns(12);
padding: em(20) 0;
padding: 20px 0;
text-align: center;
a {
@ -94,7 +94,7 @@
float: none;
i {
margin-right: em(10);
margin-right: 10px;
}
}
}
@ -103,13 +103,13 @@
#gather-area {
@include span-columns(12);
$column-border-width: em(15);
$column-border-radius: em(5);
$column-border-width: 15px;
$column-border-radius: 5px;
.gather-columns {
@include span-columns(12);
@include row(table);
margin-bottom: em(20);
margin-bottom: 20px;
margin-left: - $column-border-width;
width: $max-width - ($column-border-width*2);
}
@ -118,14 +118,13 @@
@include span-columns(4);
@include pad;
border-radius: $column-border-width + $column-border-radius;
overflow-y: scroll;
padding-bottom: em(20);
padding-bottom: 20px;
background: $light-gray;
padding: em(20);
padding: 20px;
border: $column-border-width solid white;
h4 {
padding-bottom: em(20);
padding-bottom: 20px;
text-align: center;
}
@ -135,7 +134,7 @@
}
ul {
margin-bottom: em(10);
margin-bottom: 10px;
}
}
@ -143,12 +142,12 @@
.captain {
color: $gold;
margin: 0 em(10);
margin: 0 10px;
}
.delete {
display: inline-block;
padding: 0 em(10);
padding: 0 10px;
}
}
}
@ -157,14 +156,14 @@
@include span-columns(12);
display: block;
clear: both;
padding: em(20) 0;
margin: em(20) 0;
border-top: em(2) solid $light-gray;
border-bottom: em(2) solid $light-gray;
padding: 20px 0;
margin: 20px 0;
border-top: 2px solid $light-gray;
border-bottom: 2px solid $light-gray;
position: relative;
.admin {
top: em(20);
top: 20px;
right: 0;
margin: 0;
position: absolute;
@ -183,9 +182,9 @@
@include span-columns(12);
@include flash;
padding: em(14);
padding: 14px;
text-align: center;
margin-left: - em(20);
margin-left: - 20px;
width: $max-width + $container-padding*2;
}

View file

@ -4,5 +4,5 @@
.pagination {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
}

View file

@ -3,7 +3,7 @@
*/
.shoutmsg {
margin-bottom: em(5);
margin-bottom: 5px;
.timestamp {
@extend .highlight;

View file

@ -39,7 +39,7 @@ table.striped > tbody {
}
> tr:nth-child(2n) td {
background-color: transparentize($light-blue, 0.9);
background-color: transparentize($light-blue, 0.95);
}
.actions {

View file

@ -3,49 +3,53 @@
*/
.tabbed {
$tabs-border-width: em(1);
$tabs-border-colour: darken($light-gray, 10);
$tabs-padding-vertical: em(8);
$tabs-padding-horizontal: em(16);
$tabs-border-width: 1px;
$tabs-border-colour: lighten($light-blue, 40%);
$tabs-padding-horizontal: 16px;
$tabs-height: 35px;
ul.tabs {
@include span-columns(12);
display: block;
font-family: $montserrat;
height: em(40);
max-height: em(40);
height: $tabs-height;
max-height: $tabs-height;
position: relative;
li {
float: left;
display: block;
background-color: $blue;
a {
border: $tabs-border-width solid $tabs-border-colour;
border-right: 0;
padding: $tabs-padding-vertical $tabs-padding-horizontal;
padding: 0 $tabs-padding-horizontal;
float: left;
display: block;
color: white;
font-weight: 400;
line-height: $tabs-height;
background-color: $blue;
&:hover {
cursor: pointer;
}
}
&:first-child a {
border-radius: $base-border-radius 0 0 0;
}
&:last-child a {
border-right: $tabs-border-width solid $tabs-border-colour;
border-radius: 0 $base-border-radius 0 0;
}
&.activeli {
z-index: 100;
background-color: $light-blue;
a {
padding-bottom: $tabs-padding-vertical + $tabs-border-width;
border-bottom: 0;
background-color: $light-blue;
}
}
}
@ -54,7 +58,8 @@
.tabbed-contents {
@include span-columns(12);
border: $tabs-border-width solid $tabs-border-colour;
padding: em(20);
border-radius: 0 $base-border-radius $base-border-radius $base-border-radius;
padding: 20px;
}
@for $i from 1 through $grid-columns {

View file

@ -2,7 +2,7 @@
Main Containers
*/
$container-padding: em(30);
$container-padding: 20px;
html,
body {
@ -41,7 +41,7 @@ body {
@include span-columns(9 of 12);
box-shadow: $content-shadow;
background: white;
padding: em(20);
padding: 20px;
}
#sidebar {
@ -94,10 +94,10 @@ h1, h2, h3, h4, h5, h6 {
ul.disc,
ol {
list-style-type: disc;
margin: em(20) 0;
margin: 20px 0;
li {
margin-left: em(40);
margin-left: 40px;
display: list-item;
}
}

View file

@ -4,17 +4,17 @@
header .banner {
@include linear-gradient($dark-blue, $deep-blue);
height: em(295);
height: 250px;
#logo {
@include span-columns(9 of 12);
min-height: em(200);
min-height: 200px;
position: relative;
img {
height: em(200);
height: 180px;
position: absolute;
top: em(20);
top: 15px;
left: 0;
z-index: 1;
}
@ -22,9 +22,8 @@ header .banner {
#authentication {
@include span-columns(3 of 12);
height: em(190);
margin: em(20) 0;
padding: em(20) 0;
margin-top: 10px;
padding: 10px 0;
color: white;
a {
@ -35,30 +34,22 @@ header .banner {
display: inline;
}
&.admin {
margin-top: em(10);
.profile {
padding-top: em(20);
}
}
.fields {
@include span-columns(12);
input {
@include span-columns(6);
margin-bottom: em(10);
margin-bottom: 10px;
}
}
.controls {
margin-top: em(20);
margin-top: 10px;
text-align: right;
input {
@include span-columns(12);
margin-bottom: em(10);
margin-bottom: 10px;
}
a {
@ -87,7 +78,7 @@ header .banner {
display: inline-block;
width: 1em;
text-align: center;
margin-right: em(10);
margin-right: 10px;
}
}
@ -95,10 +86,10 @@ header .banner {
vertical-align: middle;
.avatar {
margin: 0 em(20) 0 0;
margin: 0 10px 0 0;
text-align: center;
border-radius: em(100);
padding: em(5);
border-radius: 100px;
padding: 5px;
vertical-align: middle;
position: relative;
width: 100%;
@ -112,8 +103,8 @@ header .banner {
height: 100%;
position: absolute;
left: 0;
border-radius: em(100);
padding: em(5);
border-radius: 100px;
padding: 5px;
}
}

View file

@ -4,17 +4,17 @@
img.flag {
display: inline-block;
vertical-align: - em(6);
margin-right: em(10);
vertical-align: - 6px;
margin-right: 10px;
}
.actions-bottom {
@include span-columns(12);
margin-top: em(20);
margin-top: 20px;
}
fieldset {
border: em(2) solid $light-gray;
border: 2px solid $light-gray;
> br:first-child,
> br:last-child {
@ -22,7 +22,7 @@ fieldset {
}
legend {
padding: 0 em(10);
padding: 0 10px;
&+br {
display: none;

View file

@ -2,11 +2,13 @@
Navigation
*/
$navigation-height: 50px;
#menu {
@include span-columns(12);
font-family: $montserrat;
height: em(60);
margin-top: - em(60);
height: $navigation-height;
margin-top: - $navigation-height;
nav {
@include outer-container;
@ -22,35 +24,39 @@ ul.navigation {
width: 100%;
background: transparent;
max-width: $max-width;
max-height: em(60);
max-height: $navigation-height;
> li {
float: left;
width: (100%/7);
border-right: 0.1em solid transparent;
border-right: 1px solid transparent;
.count {
float: right;
font-size: em(14);
border-radius: em(25);
position: absolute;
top: $navigation-height/2 - ($navigation-height/2)/2;
right: 12px;
border-radius: $navigation-height/2;
background-color: $light-blue;
display: inline-block;
color: white;
line-height: em(14);
padding: em(5) em(8);
margin-top: - em(2);
line-height: $navigation-height/2;
padding: 0 8px;
font-size: 12px;
font-weight: bold;
height: $navigation-height/2;
}
a {
font-weight: 400;
font-size: 15px;
height: $navigation-height;
line-height: $navigation-height;
padding: 0 20px;
}
> a {
width: 100%;
color: white;
height: em(60);
line-height: em(16);
padding: em(22);
float: left;
position: relative;
background-color: $navbar-primary;
@ -73,14 +79,13 @@ ul.navigation {
i {
color: lighten($light-blue, 30);
max-height: 60px;
max-height: $navigation-height;
position: absolute;
top: 0;
right: 0;
font-size: em(24);
font-size: 24px;
line-height: 1em;
padding: em(12);
padding-right: em(14);
padding: $navigation-height/4;
}
}
@ -98,7 +103,7 @@ ul.navigation {
box-shadow: $content-shadow;
display: block;
position: absolute;
top: em(60);
top: $navigation-height;
left: 0;
min-width: 100%;
background-color: $navbar-primary;
@ -107,10 +112,10 @@ ul.navigation {
margin: 0;
li {
border-bottom: em(1) solid $navbar-secondary;
border-bottom: 1px solid $navbar-secondary;
&:first-child {
border-top: em(1) solid $navbar-secondary;
border-top: 1px solid $navbar-secondary;
}
&:last-child {
@ -120,9 +125,6 @@ ul.navigation {
a {
white-space: nowrap;
display: block;
height: em(60);
line-height: em(16);
padding: em(22);
color: $navbar-text;
}

View file

@ -3,8 +3,8 @@
.widget {
@include span-columns(12);
box-shadow: $content-shadow;
margin-bottom: em(30);
padding: em(20);
margin-bottom: $container-padding;
padding: 20px;
background: white;
h4 {
@ -13,16 +13,17 @@
.widget-content-wrapper {
@include span-columns(12);
font-size: em(14);
font-size: 14px;
}
.separator {
color: white;
background: $blue;
padding: em(12) em(24);
padding: 0 20px;
margin: 0 -20px;
margin-bottom: em(12);
margin-bottom: 12px;
font-weight: 600;
line-height: 35px;
a {
color: white;
@ -36,7 +37,7 @@
}
.calendar {
max-height: 500px;
max-height: 400px;
overflow-x: scroll;
}
@ -47,7 +48,7 @@
input {
@include span-columns(12);
margin-bottom: em(10);
margin-bottom: 10px;
}
}
@ -55,7 +56,7 @@
.posts {
ol {
margin-bottom: em(20);
margin-bottom: 20px;
&:last-child {
margin-bottom: 0;
@ -66,7 +67,7 @@
.poll {
.question {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
h5 {
margin-bottom: 1em;

View file

@ -3,17 +3,19 @@
*/
@mixin button($background: $button-primary, $text: $button-text) {
$button-height: 35px;
@include linear-gradient($blue, $dark-blue);
border-radius: $base-border-radius;
font-family: $montserrat;
font-size: em(16);
font-size: 14px;
background-color: $background;
color: $text;
height: em(40);
padding: 0 em(18);
line-height: em(40);
height: $button-height;
padding: 0 $button-height/2;
line-height: $button-height;
float: left;
margin: 0 em(20) em(20) 0;
margin: 0 $button-height/2 $button-height/2 0;
border: 0;
text-transform: uppercase;
cursor: pointer;
@ -32,10 +34,10 @@ a.button,
&.tiny {
@include linear-gradient($light-blue, $blue);
background-color: transparent;
border-radius: em(14);
line-height: em(25);
height: em(25);
padding: 0 em(12);
margin: 0 em(10) 0 0;
border-radius: 14px;
line-height: 25px;
height: 25px;
padding: 0 12px;
margin: 0 10px 0 0;
}
}

View file

@ -3,11 +3,11 @@
*/
@mixin flash($background: $flash-notice, $text: $flash-text) {
$flash-height: 35px;
background-color: $background;
color: $text;
font-size: em(16);
line-height: em(16);
padding: em(14) em(14) em(14) em(54);
padding: 7px 7px 7px 44px;
position: relative;
&:before {
@ -22,10 +22,9 @@
top: 0;
left: 0;
float: left;
width: em(44);
width: $flash-height;
height: 100%;
padding: em(9);
line-height: em(26);
padding: 7px;
text-align: center;
}
}
@ -35,11 +34,11 @@
*/
.highlight {
font-size: em(14);
border-radius: em(3);
font-size: 14px;
border-radius: 3px;
background: $blue;
color: white;
display: inline-block;
font-style: italic;
padding: 0 em(6);
padding: 0 6px;
}

View file

@ -11,7 +11,7 @@
text-align: right;
i {
margin-left: em(5);
margin-left: 5px;
}
}
}

View file

@ -4,7 +4,7 @@
div#matches {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
}
/*
@ -12,7 +12,7 @@ div#matches {
*/
table.contest {
margin-bottom: em(40);
margin-bottom: 40px;
.fa-chevron-up {
color: $light-green;
@ -44,7 +44,7 @@ table.contest {
text-align: right;
i {
padding-left: em(5);
padding-left: 5px;
}
}
}
@ -74,7 +74,7 @@ table.contest {
div.widget.contest {
a.button {
margin: em(20) 0 0;
margin: 20px 0 0;
text-align: center;
width: 100%;
}
@ -93,7 +93,7 @@ div.standings {
*/
table.brackets {
margin: em(20) 0 em(40) 0;
margin: 20px 0 40px 0;
width: auto;
td {
@ -112,16 +112,16 @@ table.brackets {
}
.flag {
width: em(44);
width: 44px;
img {
width: em(24);
margin-left: em(10);
width: 24px;
margin-left: 10px;
}
}
.team {
padding: em(5) 0;
padding: 5px 0;
background-color: $light-gray;
border-right: 1px solid $medium-gray;
clear: both;
@ -131,13 +131,13 @@ table.brackets {
}
> a {
padding-left: em(10);
padding-left: 10px;
}
}
.bracket {
padding: 0 em(10) 0 0;
width: em(158);
padding: 0 10px 0 0;
width: 158px;
}
.connector {
@ -145,7 +145,7 @@ table.brackets {
}
> tbody > tr > td {
width: em(150);
width: 150px;
}
}
@ -285,7 +285,7 @@ table.brackets {
div.current {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
table {
@ -310,7 +310,7 @@ table.brackets {
div.previous {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
table {

View file

@ -7,7 +7,7 @@
.actions,
.files-list {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
}
}
@ -19,14 +19,14 @@
.file {
@include span-columns(12);
padding-top: em(20);
margin-bottom: em(20);
padding-top: 20px;
margin-bottom: 20px;
position: relative;
border-top: em(3) solid $light-gray;
border-top: 3px solid $light-gray;
.actions {
position: absolute;
top: em(20);
top: 20px;
right: 0;
}
@ -34,14 +34,14 @@
float: right;
i {
margin-right: em(10);
margin-right: 10px;
}
}
}
.controls {
@include span-columns(12);
margin-top: em(20);
margin-top: 20px;
}
}
@ -53,7 +53,7 @@
.filters {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
}
}
@ -61,7 +61,7 @@ table.movie {
.controls {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
}
}
@ -78,7 +78,7 @@ table.movie {
height: 0px;
padding-bottom: 56%;
padding-top: 50px;
margin-bottom: em(20);
margin-bottom: 20px;
object {
position: absolute;

View file

@ -28,7 +28,11 @@ div#categories {
.bullet {
width: 10%;
background: image-url('layout/forum-category.png') center center no-repeat;
background: {
image: url('layout/forum-category.png');
position: center center;
repeat: no-repeat;
}
&.highlight {
background-image: image-url('layout/forum-category-highlight.png');
@ -37,7 +41,7 @@ div#categories {
.forum {
width: 45%;
padding-right: em(10);
padding-right: 10px;
}
.actions {
@ -61,7 +65,7 @@ div#categories {
#topics {
table-layout: auto;
margin-bottom: em(40);
margin-bottom: 40px;
.topic {
width: 55%;
@ -82,7 +86,7 @@ div#categories {
}
.statistics {
margin: em(20) 0;
margin: 20px 0;
h4 {
margin-bottom: 1em;
@ -92,7 +96,7 @@ div#categories {
#topic {
.controls {
margin-top: em(20);
margin-top: 20px;
}
#reply {
@ -106,16 +110,17 @@ div#categories {
#posts {
@include span-columns(12);
margin-top: em(20);
margin-top: 20px;
.post {
@include span-columns(12);
border-top: em(3) solid $light-gray;
padding: em(20) 0;
padding: 20px;
margin-bottom: 20px;
background: transparentize($light-gray, 0.5);
border-radius: 5px;
&:last-child {
border-bottom: em(3) solid $light-gray;
margin-bottom: em(40);
margin-bottom: 40px;
}
.avatar {
@ -130,7 +135,7 @@ div#categories {
.team {
@include span-columns(12);
text-align: center;
margin-bottom: em(10);
margin-bottom: 10px;
}
.admin {
@ -145,17 +150,15 @@ div#categories {
.text,
.signature {
@include span-columns(12);
padding: em(20) 0;
padding: 20px 0;
}
.text {
border-radius: $base-border-radius;
background: $light-gray;
margin-top: em(20);
padding: em(20);
margin-top: 20px;
fieldset {
border-color: $light-blue;
border-color: darken($light-gray, 10);
border-radius: $base-border-radius;
}
}
}

View file

@ -6,7 +6,7 @@ table#matches {
width: 100%;
display: table;
table-layout: auto;
margin-bottom: em(20);
margin-bottom: 20px;
.opponent {
width: 30%;
@ -28,8 +28,10 @@ table#matches {
*/
div#match {
$title-height: 75px;
@include span-columns(12);
border-bottom: em(3) solid $light-gray;
border-bottom: 3px solid $light-gray;
.contesters,
.details,
@ -40,18 +42,18 @@ div#match {
}
.contesters {
margin-bottom: em(20);
margin-bottom: 20px;
.vs {
margin: 0 auto;
display: block;
font: 50px $montserrat;
font: $title-height/2 $montserrat;
border-radius: 50px;
background: $blue;
width: 100px;
height: 100px;
width: $title-height;
height: $title-height;
text-align: center;
line-height: 100px;
line-height: $title-height;
color: white;
font-style: italic;
text-transform: uppercase;
@ -61,19 +63,19 @@ div#match {
.team-1,
.team-2 {
max-height: 100px;
max-height: $title-height;
overflow: hidden;
}
.team-1 {
@include span-columns(5);
line-height: 100px;
line-height: $title-height;
text-align: right;
}
.team-2 {
@include span-columns(5);
line-height: 100px;
line-height: $title-height;
text-align: left;
}
@ -88,7 +90,7 @@ div#match {
position: absolute;
background: white;
width: 1px;
height: 100px;
height: $title-height;
margin: 0 auto;
left: 50%;
top: 0;
@ -96,30 +98,30 @@ div#match {
.score-1,
.score-2 {
font: 50px $montserrat;
font: $title-height/2 $montserrat;
color: white;
width: 50%;
position: absolute;
top: 0;
text-align: center;
line-height: 100px;
line-height: $title-height;
font-weight: bold;
}
.score-1 {
padding-left: 15px;
padding-left: $title-height/3;
left: 0;
}
.score-2 {
padding-right: 15px;
padding-right: $title-height/3;
right: 0;
}
}
}
.details {
margin-bottom: em(20);
margin-bottom: 20px;
text-align: center;
.contest,
@ -133,13 +135,13 @@ div#match {
}
.contest {
margin-bottom: em(10);
margin-bottom: 10px;
}
}
.lineups {
@include span-columns(12);
margin: em(20) 0 em(40);
margin: 20px 0 40px;
h3 {
text-align: center;
@ -156,8 +158,8 @@ div#match {
.player {
@include span-columns(12);
line-height: em(40);
margin-bottom: em(10);
line-height: 40px;
margin-bottom: 10px;
}
.players {
@ -187,7 +189,7 @@ div#match {
text-align: right;
.flag {
margin: 0 0 0 em(10);
margin: 0 0 0 10px;
}
.controls {
@ -235,7 +237,7 @@ div#match {
.scoring {
@include span-columns(12);
border-top: em(3) solid $light-gray;
border-top: 3px solid $light-gray;
h3 {
margin-bottom: 1em;
@ -245,7 +247,7 @@ div#match {
width: auto;
margin-left: 0;
text-align: center;
width: em(40);
width: 40px;
}
}
@ -266,7 +268,7 @@ div#match {
input {
float: none;
margin: em(20) 0 0 0;
margin: 20px 0 0 0;
}
}
@ -275,7 +277,7 @@ div#match {
text-align: right;
.highlight {
margin-left: em(10);
margin-left: 10px;
}
}
@ -285,24 +287,24 @@ div#match {
text-align: left;
.highlight {
margin-right: em(10);
margin-right: 10px;
}
}
}
.report {
margin: em(20) 0;
padding-top: em(20);
border-top: em(3) solid $light-gray;
margin: 20px 0;
padding-top: 20px;
border-top: 3px solid $light-gray;
textarea {
margin: em(20) 0;
margin: 20px 0;
width: 100%;
height: em(600);
height: 600px;
}
.mceLayout {
margin: em(20) 0;
margin: 20px 0;
}
}
}
@ -318,7 +320,7 @@ div#map {
text-align: center;
img {
margin: em(20) 0;
margin: 20px 0;
}
}
}

View file

@ -5,7 +5,7 @@
div.article {
@include span-columns(12);
border-bottom: 1px solid rgba(35, 35, 35, 0.1);
padding-bottom: em(20);
padding-bottom: 20px;
h1 {
margin: 1em 0;
@ -13,7 +13,7 @@ div.article {
.content {
@include span-columns(12);
margin-bottom: em(40);
margin-bottom: 40px;
ul {
@extend ul.disc;
@ -34,14 +34,14 @@ div.article {
text-align: right;
.fa {
margin-right: em(10);
margin-right: 10px;
}
}
.actions {
@include span-columns(12);
@include omega;
margin-top: em(10);
margin-top: 10px;
}
&:first-child {
@ -59,7 +59,7 @@ div.article-links {
@include span-columns(6);
.fa {
padding-right: em(10);
padding-right: 10px;
}
}
@ -69,7 +69,7 @@ div.article-links {
text-align: right;
.fa {
padding-left: em(10);
padding-left: 10px;
}
}
}
@ -81,22 +81,22 @@ div.article-links {
form.article {
h4 {
margin-bottom: em(20);
margin-bottom: 20px;
}
}
.files {
.files-list {
margin: em(20) 0 em(40);
margin: 20px 0 40px;
}
form {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
.fields {
margin-bottom: em(20);
margin-bottom: 20px;
}
}
}
@ -115,11 +115,11 @@ form.article {
.article-list {
@include span-columns(12);
margin-bottom: em(10);
margin-bottom: 10px;
.new {
@extend .highlight;
margin-right: em(10);
margin-right: 10px;
}
.title {
@ -134,7 +134,7 @@ form.article {
}
.button.new {
margin-top: em(20);
margin-top: 20px;
}
}

View file

@ -44,8 +44,8 @@ table.polls {
.remove {
display: inline-block;
line-height: em(40);
margin-left: em(10);
line-height: 40px;
margin-left: 10px;
}
}
}

View file

@ -4,13 +4,13 @@
#servers {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
div.server {
@include span-columns(12);
margin-bottom: em(20);
padding-bottom: em(20);
border-bottom: em(3) solid $light-gray;
margin-bottom: 20px;
padding-bottom: 20px;
border-bottom: 3px solid $light-gray;
position: relative;
.connect {

View file

@ -38,7 +38,7 @@
}
.tabbed-contents {
margin-bottom: em(20);
margin-bottom: 20px;
}
}
}
@ -51,7 +51,7 @@
.logo {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
text-align: center;
img {
@ -63,7 +63,7 @@
.controls {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
}
}

View file

@ -32,7 +32,7 @@
@include span-columns(12);
.tabbed-contents {
margin-bottom: em(20);
margin-bottom: 20px;
}
}
@ -58,7 +58,7 @@
.photo {
@include span-columns(12);
margin: em(20) 0;
margin: 20px 0;
text-align: center;
img {
@ -70,7 +70,7 @@
#user-data {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
h2,
h3,
@ -88,7 +88,7 @@
}
.achievements {
margin-bottom: em(20);
margin-bottom: 20px;
}
tbody td {
@ -129,12 +129,12 @@
}
table {
margin-bottom: em(20);
margin-bottom: 20px;
}
form {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
}
.tab {
@ -146,7 +146,7 @@
#teams {
table {
margin-bottom: em(40);
margin-bottom: 40px;
}
}
}
@ -169,14 +169,14 @@
.message {
@include span-columns(12);
margin-bottom: em(20);
margin-bottom: 20px;
.subject {
margin-bottom: 1em;
}
.content {
margin-bottom: em(20);
margin-bottom: 20px;
}
a.message {
@ -191,7 +191,7 @@
}
.back {
margin-top: em(20);
margin-top: 20px;
}
}

View file

@ -5,7 +5,7 @@
<h3><%=h cat.name %></h3>
<div class="category">
<table class="category">
<table class="category striped">
<tr>
<th colspan="2" class="forums">Forums</th>
<th class="actions"></th>

View file

@ -8,7 +8,7 @@
<%= will_paginate @topics %>
<table id="topics">
<table id="topics" class="striped">
<tr>
<th class="topic">Topic</th>
<th class="author">Author</th>

View file

@ -25,9 +25,9 @@
<div class="content">
<div class="header">
<div class="time">
<a name="post_<%= post.id %>">
<span id="post_<%= post.id %>">
<%= longtime(post.created_at) %>
</a>
</span>
</div>
<div class="posts">
<%= link_to "##{post.number(@posts, n)}", "#post_#{post.id}" %>