From 2467c186ffd554aaaf00b140f668db7d0e5cd684 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:09:26 -0700 Subject: [PATCH 01/27] Copying font weight changes --- .../stylesheets/themes/default/components/_flashes.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/themes/default/components/_flashes.scss b/app/assets/stylesheets/themes/default/components/_flashes.scss index 3a2772a..37a378f 100644 --- a/app/assets/stylesheets/themes/default/components/_flashes.scss +++ b/app/assets/stylesheets/themes/default/components/_flashes.scss @@ -5,7 +5,7 @@ .flash { @include span-columns(12); margin-bottom: 20px; - font-weight: 600; + font-weight: 400; &.notice { @include flash; @@ -109,4 +109,4 @@ div#errors { } } } -} \ No newline at end of file +} From 5d669ef7f57c7a86b60d735bcb613379cc644a2d Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:10:23 -0700 Subject: [PATCH 02/27] Copying font weight changes --- app/assets/stylesheets/themes/default/components/_lists.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/components/_lists.scss b/app/assets/stylesheets/themes/default/components/_lists.scss index 370267a..ce22bfb 100644 --- a/app/assets/stylesheets/themes/default/components/_lists.scss +++ b/app/assets/stylesheets/themes/default/components/_lists.scss @@ -21,7 +21,7 @@ dl { margin-bottom: $base-line-height / 2; dt { - font-weight: bold; + font-weight: 400; margin-top: $base-line-height / 2; } From 36dd50231086604b100cd19dd4836fdfdafc43ea Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:11:05 -0700 Subject: [PATCH 03/27] Copying font weight changes --- app/assets/stylesheets/themes/default/components/_tables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/components/_tables.scss b/app/assets/stylesheets/themes/default/components/_tables.scss index d7592ca..2e81be0 100644 --- a/app/assets/stylesheets/themes/default/components/_tables.scss +++ b/app/assets/stylesheets/themes/default/components/_tables.scss @@ -11,7 +11,7 @@ table { th { border-bottom: 1px solid darken($base-border-color, 15%); - font-weight: bold; + font-weight: 400; padding: 0.5em 0; text-align: left; } From 819ffb50779a40285703c5694fe0d21624537844 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:12:43 -0700 Subject: [PATCH 04/27] Copying font weight changes --- app/assets/stylesheets/themes/default/layout/_typography.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/layout/_typography.scss b/app/assets/stylesheets/themes/default/layout/_typography.scss index caef643..10cdeb4 100644 --- a/app/assets/stylesheets/themes/default/layout/_typography.scss +++ b/app/assets/stylesheets/themes/default/layout/_typography.scss @@ -18,6 +18,7 @@ h1, h2, h3, h4, h5, h6 { line-height: 1.25em; margin: 0; text-rendering: optimizeLegibility; // Fix the character spacing for headings + font-weight: 400; a { color: $dark-blue; @@ -55,7 +56,7 @@ p { a { color: $base-link-color; text-decoration: none; - font-weight: 600; + font-weight: 400; @include transition(color 0.1s linear); &:hover { From 9c4631fc23f521ae662bc8489d7ca0c6c4ae33c3 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:13:39 -0700 Subject: [PATCH 05/27] Copying font weight changes --- app/assets/stylesheets/themes/default/pages/_forums.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/pages/_forums.scss b/app/assets/stylesheets/themes/default/pages/_forums.scss index 503fdec..c77933a 100644 --- a/app/assets/stylesheets/themes/default/pages/_forums.scss +++ b/app/assets/stylesheets/themes/default/pages/_forums.scss @@ -127,7 +127,7 @@ div#categories { .unread { color: $blue; - font-weight:bold; + font-weight:400; } thead th { From 97c664ec8135f713df45cc7082d57d52e516ee45 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:16:15 -0700 Subject: [PATCH 06/27] Copying font weight changes --- app/assets/stylesheets/themes/default/pages/_matches.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/themes/default/pages/_matches.scss b/app/assets/stylesheets/themes/default/pages/_matches.scss index 4b6f036..7d9e40b 100644 --- a/app/assets/stylesheets/themes/default/pages/_matches.scss +++ b/app/assets/stylesheets/themes/default/pages/_matches.scss @@ -58,7 +58,7 @@ div#match { font-style: italic; text-transform: uppercase; padding-right: 10px; - font-weight: bold; + font-weight: 400; } .team-1, @@ -82,7 +82,7 @@ div#match { .versus { @include span-columns(2); position: relative; - font-weight: bold; + font-weight: 400; &.split:before { content: ""; @@ -105,7 +105,7 @@ div#match { top: 0; text-align: center; line-height: $title-height; - font-weight: bold; + font-weight: 400; } .score-1 { From a765901ab54cfc18559b023d476e705a2ebc8adf Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:16:50 -0700 Subject: [PATCH 07/27] Copying font weight changes --- app/assets/stylesheets/themes/default/pages/_news.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/pages/_news.scss b/app/assets/stylesheets/themes/default/pages/_news.scss index bbb530b..cb82e3c 100644 --- a/app/assets/stylesheets/themes/default/pages/_news.scss +++ b/app/assets/stylesheets/themes/default/pages/_news.scss @@ -28,7 +28,7 @@ div.article { @include span-columns(6); a { - font-weight: bold; + font-weight: 400; } } From d13e460bf7d35e75256a3b60357df705226bc551 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:17:35 -0700 Subject: [PATCH 08/27] Copying font weight changes --- app/assets/stylesheets/themes/default/pages/_users.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/themes/default/pages/_users.scss b/app/assets/stylesheets/themes/default/pages/_users.scss index bd69cfe..ede7b30 100644 --- a/app/assets/stylesheets/themes/default/pages/_users.scss +++ b/app/assets/stylesheets/themes/default/pages/_users.scss @@ -195,7 +195,7 @@ } &.highlight { - font-weight: bold; + font-weight: 400; } } @@ -222,4 +222,4 @@ table.staff { .age { width: 5%; } -} \ No newline at end of file +} From 3f3e7053870e3834e0f52f43da1e984fef16e121 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:23:26 -0700 Subject: [PATCH 09/27] Fixed incorrect font useage --- app/assets/stylesheets/themes/default/layout/_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/layout/_sidebar.scss b/app/assets/stylesheets/themes/default/layout/_sidebar.scss index eb9975b..0260bed 100644 --- a/app/assets/stylesheets/themes/default/layout/_sidebar.scss +++ b/app/assets/stylesheets/themes/default/layout/_sidebar.scss @@ -3,7 +3,7 @@ .widget { @include span-columns(12); margin-bottom: $container-padding; - font-family: $header-font-family; + font-family: $base-font-family; color: white; padding-top: 20px; position: relative; From 0b843d9fd8917317e7a508899cbe44bd73177399 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Mon, 29 Sep 2014 18:32:50 -0700 Subject: [PATCH 10/27] Fixes wrapping issues with small screens/mobile Theoretically should work this time. Initially put the code int he wrong CSS class. --- app/assets/stylesheets/themes/default/layout/_body.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/layout/_body.scss b/app/assets/stylesheets/themes/default/layout/_body.scss index b227c40..8d308dc 100644 --- a/app/assets/stylesheets/themes/default/layout/_body.scss +++ b/app/assets/stylesheets/themes/default/layout/_body.scss @@ -10,6 +10,7 @@ body { padding: 0; width: 100%; min-height: 100%; + min-width: 1020px; } body#tinymce { @@ -18,7 +19,6 @@ body#tinymce { #container { min-height: 100%; - min-width: 1020px; background: { color: $blue; image: image-url("#{$theme-path}/layout/background.jpg"); From 1f954206de65270b7e37ff86eae3a85e53bf0ff4 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:18:13 -0700 Subject: [PATCH 11/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/pages/_users.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/pages/_users.scss b/app/assets/stylesheets/themes/default/pages/_users.scss index ede7b30..90ffddc 100644 --- a/app/assets/stylesheets/themes/default/pages/_users.scss +++ b/app/assets/stylesheets/themes/default/pages/_users.scss @@ -195,7 +195,7 @@ } &.highlight { - font-weight: 400; + font-weight: bold; } } From 77bff486f067d5a6db066af896d43dbdf9ea8866 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:19:01 -0700 Subject: [PATCH 12/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/pages/_news.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/pages/_news.scss b/app/assets/stylesheets/themes/default/pages/_news.scss index cb82e3c..bbb530b 100644 --- a/app/assets/stylesheets/themes/default/pages/_news.scss +++ b/app/assets/stylesheets/themes/default/pages/_news.scss @@ -28,7 +28,7 @@ div.article { @include span-columns(6); a { - font-weight: 400; + font-weight: bold; } } From f5d00cc2fc1cc75523af1c7d479f43cc016ff98c Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:20:58 -0700 Subject: [PATCH 13/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/pages/_matches.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/themes/default/pages/_matches.scss b/app/assets/stylesheets/themes/default/pages/_matches.scss index 7d9e40b..4b6f036 100644 --- a/app/assets/stylesheets/themes/default/pages/_matches.scss +++ b/app/assets/stylesheets/themes/default/pages/_matches.scss @@ -58,7 +58,7 @@ div#match { font-style: italic; text-transform: uppercase; padding-right: 10px; - font-weight: 400; + font-weight: bold; } .team-1, @@ -82,7 +82,7 @@ div#match { .versus { @include span-columns(2); position: relative; - font-weight: 400; + font-weight: bold; &.split:before { content: ""; @@ -105,7 +105,7 @@ div#match { top: 0; text-align: center; line-height: $title-height; - font-weight: 400; + font-weight: bold; } .score-1 { From e0b6c15c9001126392bdbc84157fe8dd29d0e9c7 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:22:53 -0700 Subject: [PATCH 14/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/pages/_forums.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/pages/_forums.scss b/app/assets/stylesheets/themes/default/pages/_forums.scss index c77933a..503fdec 100644 --- a/app/assets/stylesheets/themes/default/pages/_forums.scss +++ b/app/assets/stylesheets/themes/default/pages/_forums.scss @@ -127,7 +127,7 @@ div#categories { .unread { color: $blue; - font-weight:400; + font-weight:bold; } thead th { From fe3424b79a37f40272ef0a00d83ef43401b964cf Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:23:53 -0700 Subject: [PATCH 15/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/layout/_typography.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/themes/default/layout/_typography.scss b/app/assets/stylesheets/themes/default/layout/_typography.scss index 10cdeb4..d3bb484 100644 --- a/app/assets/stylesheets/themes/default/layout/_typography.scss +++ b/app/assets/stylesheets/themes/default/layout/_typography.scss @@ -18,7 +18,6 @@ h1, h2, h3, h4, h5, h6 { line-height: 1.25em; margin: 0; text-rendering: optimizeLegibility; // Fix the character spacing for headings - font-weight: 400; a { color: $dark-blue; @@ -56,7 +55,7 @@ p { a { color: $base-link-color; text-decoration: none; - font-weight: 400; + font-weight: bold; @include transition(color 0.1s linear); &:hover { From cbcf30daff647a1f6301d077992d9f598ceae843 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:24:33 -0700 Subject: [PATCH 16/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/components/_tables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/components/_tables.scss b/app/assets/stylesheets/themes/default/components/_tables.scss index 2e81be0..d7592ca 100644 --- a/app/assets/stylesheets/themes/default/components/_tables.scss +++ b/app/assets/stylesheets/themes/default/components/_tables.scss @@ -11,7 +11,7 @@ table { th { border-bottom: 1px solid darken($base-border-color, 15%); - font-weight: 400; + font-weight: bold; padding: 0.5em 0; text-align: left; } From 2269fcbb8a136a38bdb72a184cc8209050d118ad Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:25:00 -0700 Subject: [PATCH 17/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/components/_lists.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/components/_lists.scss b/app/assets/stylesheets/themes/default/components/_lists.scss index ce22bfb..370267a 100644 --- a/app/assets/stylesheets/themes/default/components/_lists.scss +++ b/app/assets/stylesheets/themes/default/components/_lists.scss @@ -21,7 +21,7 @@ dl { margin-bottom: $base-line-height / 2; dt { - font-weight: 400; + font-weight: bold; margin-top: $base-line-height / 2; } From 6afa73dc91ad2fbcc22cdfe97fd791710662230d Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:25:35 -0700 Subject: [PATCH 18/27] Reverting font weight changes --- app/assets/stylesheets/themes/default/components/_flashes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/components/_flashes.scss b/app/assets/stylesheets/themes/default/components/_flashes.scss index 37a378f..72f92b3 100644 --- a/app/assets/stylesheets/themes/default/components/_flashes.scss +++ b/app/assets/stylesheets/themes/default/components/_flashes.scss @@ -5,7 +5,7 @@ .flash { @include span-columns(12); margin-bottom: 20px; - font-weight: 400; + font-weight: bold; &.notice { @include flash; From 26cee800f691691ab1fb802c49179b05ecfbf198 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Thu, 9 Oct 2014 20:28:33 -0700 Subject: [PATCH 19/27] Possibly fixing font weight issues in OSX Firefox --- app/assets/stylesheets/themes/default/layout/_hacks.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/layout/_hacks.scss b/app/assets/stylesheets/themes/default/layout/_hacks.scss index ca49d1e..c3441bd 100644 --- a/app/assets/stylesheets/themes/default/layout/_hacks.scss +++ b/app/assets/stylesheets/themes/default/layout/_hacks.scss @@ -2,8 +2,13 @@ Firefox select hacks */ +body { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + select { -moz-appearance: none; text-indent: 0.01px; text-overflow: ''; -} \ No newline at end of file +} From b57c9827790df6f1c2c4a373eaed9025b4c17f5c Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Sat, 11 Oct 2014 01:12:32 -0700 Subject: [PATCH 20/27] Moving the bold hack --- app/assets/stylesheets/themes/default/layout/_hacks.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/stylesheets/themes/default/layout/_hacks.scss b/app/assets/stylesheets/themes/default/layout/_hacks.scss index c3441bd..15a4b20 100644 --- a/app/assets/stylesheets/themes/default/layout/_hacks.scss +++ b/app/assets/stylesheets/themes/default/layout/_hacks.scss @@ -2,11 +2,6 @@ Firefox select hacks */ -body { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - select { -moz-appearance: none; text-indent: 0.01px; From 8c8c5b88195643d2243228db80fd841ded307994 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Sat, 11 Oct 2014 01:15:12 -0700 Subject: [PATCH 21/27] Moved the bold hack to here --- app/assets/stylesheets/themes/default/layout/_body.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/themes/default/layout/_body.scss b/app/assets/stylesheets/themes/default/layout/_body.scss index 8d308dc..fc21b6f 100644 --- a/app/assets/stylesheets/themes/default/layout/_body.scss +++ b/app/assets/stylesheets/themes/default/layout/_body.scss @@ -11,6 +11,8 @@ body { width: 100%; min-height: 100%; min-width: 1020px; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } body#tinymce { From 888062726e47882d6566f8c3362369d1f67e3a34 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Sat, 11 Oct 2014 01:25:36 -0700 Subject: [PATCH 22/27] Actually didn't want the hack here. --- app/assets/stylesheets/themes/default/layout/_body.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/stylesheets/themes/default/layout/_body.scss b/app/assets/stylesheets/themes/default/layout/_body.scss index fc21b6f..8d308dc 100644 --- a/app/assets/stylesheets/themes/default/layout/_body.scss +++ b/app/assets/stylesheets/themes/default/layout/_body.scss @@ -11,8 +11,6 @@ body { width: 100%; min-height: 100%; min-width: 1020px; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; } body#tinymce { From 31cb2ba6a090e53c9b47eae7a0d8019acf1d1cd7 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Sat, 11 Oct 2014 01:26:08 -0700 Subject: [PATCH 23/27] Put the bold hack thing here. --- app/assets/stylesheets/themes/default/layout/_typography.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/themes/default/layout/_typography.scss b/app/assets/stylesheets/themes/default/layout/_typography.scss index d3bb484..2352440 100644 --- a/app/assets/stylesheets/themes/default/layout/_typography.scss +++ b/app/assets/stylesheets/themes/default/layout/_typography.scss @@ -10,6 +10,7 @@ body { font-family: $base-font-family; font-size: $base-font-size; -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; line-height: $base-line-height; } From b5d003855d34f035dec778991b2471f77e65552b Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Sat, 11 Oct 2014 16:55:09 -0700 Subject: [PATCH 24/27] Kludge fix for boldness --- app/assets/stylesheets/themes/default/layout/_typography.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/themes/default/layout/_typography.scss b/app/assets/stylesheets/themes/default/layout/_typography.scss index 2352440..2d3486a 100644 --- a/app/assets/stylesheets/themes/default/layout/_typography.scss +++ b/app/assets/stylesheets/themes/default/layout/_typography.scss @@ -18,6 +18,7 @@ h1, h2, h3, h4, h5, h6 { font-family: $header-font-family; line-height: 1.25em; margin: 0; + opacity:0.99; text-rendering: optimizeLegibility; // Fix the character spacing for headings a { From 752ddcdc5f126b4a063c856fa193a34d25ad97ca Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Sat, 4 Apr 2015 09:10:05 -0700 Subject: [PATCH 25/27] Redoing that stupid fix mobile/small screen thing --- app/assets/stylesheets/themes/default/layout/_body.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/themes/default/layout/_body.scss b/app/assets/stylesheets/themes/default/layout/_body.scss index 8d308dc..b227c40 100644 --- a/app/assets/stylesheets/themes/default/layout/_body.scss +++ b/app/assets/stylesheets/themes/default/layout/_body.scss @@ -10,7 +10,6 @@ body { padding: 0; width: 100%; min-height: 100%; - min-width: 1020px; } body#tinymce { @@ -19,6 +18,7 @@ body#tinymce { #container { min-height: 100%; + min-width: 1020px; background: { color: $blue; image: image-url("#{$theme-path}/layout/background.jpg"); From f79969b1d4a8bc50295b16e8baf119a031da98ce Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Tue, 7 Apr 2015 23:04:43 +0100 Subject: [PATCH 26/27] Squashed commit of the following: commit 752ddcdc5f126b4a063c856fa193a34d25ad97ca Author: onyxserpent Date: Sat Apr 4 09:10:05 2015 -0700 Redoing that stupid fix mobile/small screen thing commit b5d003855d34f035dec778991b2471f77e65552b Author: onyxserpent Date: Sat Oct 11 16:55:09 2014 -0700 Kludge fix for boldness commit 31cb2ba6a090e53c9b47eae7a0d8019acf1d1cd7 Author: onyxserpent Date: Sat Oct 11 01:26:08 2014 -0700 Put the bold hack thing here. commit 888062726e47882d6566f8c3362369d1f67e3a34 Author: onyxserpent Date: Sat Oct 11 01:25:36 2014 -0700 Actually didn't want the hack here. commit 8c8c5b88195643d2243228db80fd841ded307994 Author: onyxserpent Date: Sat Oct 11 01:15:12 2014 -0700 Moved the bold hack to here commit b57c9827790df6f1c2c4a373eaed9025b4c17f5c Author: onyxserpent Date: Sat Oct 11 01:12:32 2014 -0700 Moving the bold hack commit 26cee800f691691ab1fb802c49179b05ecfbf198 Author: onyxserpent Date: Thu Oct 9 20:28:33 2014 -0700 Possibly fixing font weight issues in OSX Firefox commit 6afa73dc91ad2fbcc22cdfe97fd791710662230d Author: onyxserpent Date: Thu Oct 9 20:25:35 2014 -0700 Reverting font weight changes commit 2269fcbb8a136a38bdb72a184cc8209050d118ad Author: onyxserpent Date: Thu Oct 9 20:25:00 2014 -0700 Reverting font weight changes commit cbcf30daff647a1f6301d077992d9f598ceae843 Author: onyxserpent Date: Thu Oct 9 20:24:33 2014 -0700 Reverting font weight changes commit fe3424b79a37f40272ef0a00d83ef43401b964cf Author: onyxserpent Date: Thu Oct 9 20:23:53 2014 -0700 Reverting font weight changes commit e0b6c15c9001126392bdbc84157fe8dd29d0e9c7 Author: onyxserpent Date: Thu Oct 9 20:22:53 2014 -0700 Reverting font weight changes commit f5d00cc2fc1cc75523af1c7d479f43cc016ff98c Author: onyxserpent Date: Thu Oct 9 20:20:58 2014 -0700 Reverting font weight changes commit 77bff486f067d5a6db066af896d43dbdf9ea8866 Author: onyxserpent Date: Thu Oct 9 20:19:01 2014 -0700 Reverting font weight changes commit 1f954206de65270b7e37ff86eae3a85e53bf0ff4 Author: onyxserpent Date: Thu Oct 9 20:18:13 2014 -0700 Reverting font weight changes commit 0b843d9fd8917317e7a508899cbe44bd73177399 Author: onyxserpent Date: Mon Sep 29 18:32:50 2014 -0700 Fixes wrapping issues with small screens/mobile Theoretically should work this time. Initially put the code int he wrong CSS class. commit 3f3e7053870e3834e0f52f43da1e984fef16e121 Author: onyxserpent Date: Mon Sep 29 18:23:26 2014 -0700 Fixed incorrect font useage commit d13e460bf7d35e75256a3b60357df705226bc551 Author: onyxserpent Date: Mon Sep 29 18:17:35 2014 -0700 Copying font weight changes commit a765901ab54cfc18559b023d476e705a2ebc8adf Author: onyxserpent Date: Mon Sep 29 18:16:50 2014 -0700 Copying font weight changes commit 97c664ec8135f713df45cc7082d57d52e516ee45 Author: onyxserpent Date: Mon Sep 29 18:16:15 2014 -0700 Copying font weight changes commit 9c4631fc23f521ae662bc8489d7ca0c6c4ae33c3 Author: onyxserpent Date: Mon Sep 29 18:13:39 2014 -0700 Copying font weight changes commit 819ffb50779a40285703c5694fe0d21624537844 Author: onyxserpent Date: Mon Sep 29 18:12:43 2014 -0700 Copying font weight changes commit 36dd50231086604b100cd19dd4836fdfdafc43ea Author: onyxserpent Date: Mon Sep 29 18:11:05 2014 -0700 Copying font weight changes commit 5d669ef7f57c7a86b60d735bcb613379cc644a2d Author: onyxserpent Date: Mon Sep 29 18:10:23 2014 -0700 Copying font weight changes commit 2467c186ffd554aaaf00b140f668db7d0e5cd684 Author: onyxserpent Date: Mon Sep 29 18:09:26 2014 -0700 Copying font weight changes --- .../stylesheets/themes/default/components/_flashes.scss | 4 ++-- app/assets/stylesheets/themes/default/layout/_hacks.scss | 2 +- app/assets/stylesheets/themes/default/layout/_typography.scss | 4 +++- app/assets/stylesheets/themes/default/pages/_users.scss | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/themes/default/components/_flashes.scss b/app/assets/stylesheets/themes/default/components/_flashes.scss index 137444f..72f92b3 100644 --- a/app/assets/stylesheets/themes/default/components/_flashes.scss +++ b/app/assets/stylesheets/themes/default/components/_flashes.scss @@ -5,7 +5,7 @@ .flash { @include span-columns(12); margin-bottom: 20px; - font-weight: 400; + font-weight: bold; &.notice { @include flash; @@ -109,4 +109,4 @@ div#errors { } } } -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/themes/default/layout/_hacks.scss b/app/assets/stylesheets/themes/default/layout/_hacks.scss index ca49d1e..15a4b20 100644 --- a/app/assets/stylesheets/themes/default/layout/_hacks.scss +++ b/app/assets/stylesheets/themes/default/layout/_hacks.scss @@ -6,4 +6,4 @@ select { -moz-appearance: none; text-indent: 0.01px; text-overflow: ''; -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/themes/default/layout/_typography.scss b/app/assets/stylesheets/themes/default/layout/_typography.scss index 10cdeb4..1e725a2 100644 --- a/app/assets/stylesheets/themes/default/layout/_typography.scss +++ b/app/assets/stylesheets/themes/default/layout/_typography.scss @@ -10,6 +10,7 @@ body { font-family: $base-font-family; font-size: $base-font-size; -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; line-height: $base-line-height; } @@ -17,6 +18,7 @@ h1, h2, h3, h4, h5, h6 { font-family: $header-font-family; line-height: 1.25em; margin: 0; + opacity:0.99; text-rendering: optimizeLegibility; // Fix the character spacing for headings font-weight: 400; @@ -56,7 +58,7 @@ p { a { color: $base-link-color; text-decoration: none; - font-weight: 400; + font-weight: bold; @include transition(color 0.1s linear); &:hover { diff --git a/app/assets/stylesheets/themes/default/pages/_users.scss b/app/assets/stylesheets/themes/default/pages/_users.scss index 78dbc35..ede7b30 100644 --- a/app/assets/stylesheets/themes/default/pages/_users.scss +++ b/app/assets/stylesheets/themes/default/pages/_users.scss @@ -222,4 +222,4 @@ table.staff { .age { width: 5%; } -} \ No newline at end of file +} From 0d55ba0e3e57ae8ea206eca7a47517008edd5162 Mon Sep 17 00:00:00 2001 From: onyxserpent Date: Sat, 4 Apr 2015 09:10:05 -0700 Subject: [PATCH 27/27] Redoing that stupid fix mobile/small screen thing Conflicts: app/assets/stylesheets/themes/default/layout/_body.scss --- app/assets/stylesheets/themes/default/layout/_body.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/stylesheets/themes/default/layout/_body.scss b/app/assets/stylesheets/themes/default/layout/_body.scss index a25a1fd..75299cc 100644 --- a/app/assets/stylesheets/themes/default/layout/_body.scss +++ b/app/assets/stylesheets/themes/default/layout/_body.scss @@ -27,6 +27,13 @@ body#tinymce { #container { min-height: 100%; + min-width: 1020px; + background: { + color: $blue; + image: image-url("#{$theme-path}/layout/background.jpg"); + position: top center; + repeat: no-repeat; + } } .wrapper {