From 7d26a92a08ffcdeaba8476aa8aa99c3bf5b956ec Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Tue, 7 Apr 2015 23:04:43 +0100 Subject: [PATCH] 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 +}