diff options
| -rw-r--r-- | app/assets/stylesheets/generic/nav_sidebar.scss (renamed from app/assets/stylesheets/sections/nav_sidebar.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/fonts.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/variables.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/admin.scss (renamed from app/assets/stylesheets/sections/admin.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss (renamed from app/assets/stylesheets/sections/commit.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss (renamed from app/assets/stylesheets/sections/commits.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/dashboard.scss (renamed from app/assets/stylesheets/sections/dashboard.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss (renamed from app/assets/stylesheets/sections/diff.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/editor.scss (renamed from app/assets/stylesheets/sections/editor.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/errors.scss (renamed from app/assets/stylesheets/sections/errors.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/events.scss (renamed from app/assets/stylesheets/sections/events.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/explore.scss (renamed from app/assets/stylesheets/sections/explore.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/graph.scss (renamed from app/assets/stylesheets/sections/graph.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/groups.scss (renamed from app/assets/stylesheets/sections/groups.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/header.scss (renamed from app/assets/stylesheets/sections/header.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/help.scss (renamed from app/assets/stylesheets/sections/help.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/import.scss (renamed from app/assets/stylesheets/sections/import.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss (renamed from app/assets/stylesheets/sections/issuable.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss (renamed from app/assets/stylesheets/sections/issues.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss (renamed from app/assets/stylesheets/sections/labels.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/login.scss (renamed from app/assets/stylesheets/sections/login.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/markdown_area.scss (renamed from app/assets/stylesheets/sections/markdown_area.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss (renamed from app/assets/stylesheets/sections/merge_requests.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/milestone.scss (renamed from app/assets/stylesheets/sections/milestone.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/note_form.scss (renamed from app/assets/stylesheets/sections/note_form.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss (renamed from app/assets/stylesheets/sections/notes.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notifications.scss (renamed from app/assets/stylesheets/sections/notifications.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss (renamed from app/assets/stylesheets/sections/profile.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss (renamed from app/assets/stylesheets/sections/projects.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss (renamed from app/assets/stylesheets/sections/search.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/snippets.scss (renamed from app/assets/stylesheets/sections/snippets.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/stat_graph.scss (renamed from app/assets/stylesheets/sections/stat_graph.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/themes.scss (renamed from app/assets/stylesheets/sections/themes.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss (renamed from app/assets/stylesheets/sections/tree.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/votes.scss (renamed from app/assets/stylesheets/sections/votes.scss) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss (renamed from app/assets/stylesheets/sections/wiki.scss) | 0 |
36 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/stylesheets/sections/nav_sidebar.scss b/app/assets/stylesheets/generic/nav_sidebar.scss index 335f1379662..335f1379662 100644 --- a/app/assets/stylesheets/sections/nav_sidebar.scss +++ b/app/assets/stylesheets/generic/nav_sidebar.scss diff --git a/app/assets/stylesheets/main/fonts.scss b/app/assets/stylesheets/main/fonts.scss deleted file mode 100644 index f945aaca848..00000000000 --- a/app/assets/stylesheets/main/fonts.scss +++ /dev/null @@ -1,3 +0,0 @@ -/** Typo **/ -$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace; -$regular_font: "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss index 6be81b23351..d751678f1b3 100644 --- a/app/assets/stylesheets/main/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -19,8 +19,14 @@ $gl-primary: #446e9b; $gl-info: #029ACF; $gl-warning: #EB9532; -/** +/* * Commit Diff Colors */ $added: #63c363; $deleted: #f77; + +/* + * Fonts + */ +$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace; +$regular_font: "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/app/assets/stylesheets/sections/admin.scss b/app/assets/stylesheets/pages/admin.scss index a51deee7970..a51deee7970 100644 --- a/app/assets/stylesheets/sections/admin.scss +++ b/app/assets/stylesheets/pages/admin.scss diff --git a/app/assets/stylesheets/sections/commit.scss b/app/assets/stylesheets/pages/commit.scss index 0e2d9571a45..0e2d9571a45 100644 --- a/app/assets/stylesheets/sections/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/pages/commits.scss index 683aca73593..683aca73593 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/pages/dashboard.scss index 96f84b7122b..96f84b7122b 100644 --- a/app/assets/stylesheets/sections/dashboard.scss +++ b/app/assets/stylesheets/pages/dashboard.scss diff --git a/app/assets/stylesheets/sections/diff.scss b/app/assets/stylesheets/pages/diff.scss index 54311a68852..54311a68852 100644 --- a/app/assets/stylesheets/sections/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss diff --git a/app/assets/stylesheets/sections/editor.scss b/app/assets/stylesheets/pages/editor.scss index 88aa256e56e..88aa256e56e 100644 --- a/app/assets/stylesheets/sections/editor.scss +++ b/app/assets/stylesheets/pages/editor.scss diff --git a/app/assets/stylesheets/sections/errors.scss b/app/assets/stylesheets/pages/errors.scss index 32d2d7b1dbf..32d2d7b1dbf 100644 --- a/app/assets/stylesheets/sections/errors.scss +++ b/app/assets/stylesheets/pages/errors.scss diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/pages/events.scss index a477359dc88..a477359dc88 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/pages/events.scss diff --git a/app/assets/stylesheets/sections/explore.scss b/app/assets/stylesheets/pages/explore.scss index 9b92128624c..9b92128624c 100644 --- a/app/assets/stylesheets/sections/explore.scss +++ b/app/assets/stylesheets/pages/explore.scss diff --git a/app/assets/stylesheets/sections/graph.scss b/app/assets/stylesheets/pages/graph.scss index 3d878d1e528..3d878d1e528 100644 --- a/app/assets/stylesheets/sections/graph.scss +++ b/app/assets/stylesheets/pages/graph.scss diff --git a/app/assets/stylesheets/sections/groups.scss b/app/assets/stylesheets/pages/groups.scss index e49fe1a9dd6..e49fe1a9dd6 100644 --- a/app/assets/stylesheets/sections/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/pages/header.scss index 26b4d04106e..26b4d04106e 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/pages/header.scss diff --git a/app/assets/stylesheets/sections/help.scss b/app/assets/stylesheets/pages/help.scss index 07c62f98c36..07c62f98c36 100644 --- a/app/assets/stylesheets/sections/help.scss +++ b/app/assets/stylesheets/pages/help.scss diff --git a/app/assets/stylesheets/sections/import.scss b/app/assets/stylesheets/pages/import.scss index 3df4bb84bd2..3df4bb84bd2 100644 --- a/app/assets/stylesheets/sections/import.scss +++ b/app/assets/stylesheets/pages/import.scss diff --git a/app/assets/stylesheets/sections/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index d8d12338859..d8d12338859 100644 --- a/app/assets/stylesheets/sections/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/pages/issues.scss index b909725bff5..b909725bff5 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss diff --git a/app/assets/stylesheets/sections/labels.scss b/app/assets/stylesheets/pages/labels.scss index d1590e42fcb..d1590e42fcb 100644 --- a/app/assets/stylesheets/sections/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/pages/login.scss index d366300511e..d366300511e 100644 --- a/app/assets/stylesheets/sections/login.scss +++ b/app/assets/stylesheets/pages/login.scss diff --git a/app/assets/stylesheets/sections/markdown_area.scss b/app/assets/stylesheets/pages/markdown_area.scss index 8ee8eaa4ee7..8ee8eaa4ee7 100644 --- a/app/assets/stylesheets/sections/markdown_area.scss +++ b/app/assets/stylesheets/pages/markdown_area.scss diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 01f6a705224..01f6a705224 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss diff --git a/app/assets/stylesheets/sections/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index d20391e38fd..d20391e38fd 100644 --- a/app/assets/stylesheets/sections/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss diff --git a/app/assets/stylesheets/sections/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index a0522030785..a0522030785 100644 --- a/app/assets/stylesheets/sections/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/pages/notes.scss index 73f23626d57..73f23626d57 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss diff --git a/app/assets/stylesheets/sections/notifications.scss b/app/assets/stylesheets/pages/notifications.scss index cc273f55222..cc273f55222 100644 --- a/app/assets/stylesheets/sections/notifications.scss +++ b/app/assets/stylesheets/pages/notifications.scss diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/pages/profile.scss index 0ab62b7ae49..0ab62b7ae49 100644 --- a/app/assets/stylesheets/sections/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/pages/projects.scss index 3a912d234fa..3a912d234fa 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss diff --git a/app/assets/stylesheets/sections/search.scss b/app/assets/stylesheets/pages/search.scss index bdaa17ac339..bdaa17ac339 100644 --- a/app/assets/stylesheets/sections/search.scss +++ b/app/assets/stylesheets/pages/search.scss diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/pages/snippets.scss index d79591d9915..d79591d9915 100644 --- a/app/assets/stylesheets/sections/snippets.scss +++ b/app/assets/stylesheets/pages/snippets.scss diff --git a/app/assets/stylesheets/sections/stat_graph.scss b/app/assets/stylesheets/pages/stat_graph.scss index b9be47e7700..b9be47e7700 100644 --- a/app/assets/stylesheets/sections/stat_graph.scss +++ b/app/assets/stylesheets/pages/stat_graph.scss diff --git a/app/assets/stylesheets/sections/themes.scss b/app/assets/stylesheets/pages/themes.scss index e69de29bb2d..e69de29bb2d 100644 --- a/app/assets/stylesheets/sections/themes.scss +++ b/app/assets/stylesheets/pages/themes.scss diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/pages/tree.scss index 3305abc7d2a..3305abc7d2a 100644 --- a/app/assets/stylesheets/sections/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss diff --git a/app/assets/stylesheets/sections/votes.scss b/app/assets/stylesheets/pages/votes.scss index ba0a519dca6..ba0a519dca6 100644 --- a/app/assets/stylesheets/sections/votes.scss +++ b/app/assets/stylesheets/pages/votes.scss diff --git a/app/assets/stylesheets/sections/wiki.scss b/app/assets/stylesheets/pages/wiki.scss index dfaeba41cf6..dfaeba41cf6 100644 --- a/app/assets/stylesheets/sections/wiki.scss +++ b/app/assets/stylesheets/pages/wiki.scss |