History

UI tweaks

Thibaut Courouble committed 9 years ago

Commit 29ec9db1 parent 88ba68510 files · +25 −25Browse files

Unified · Split

10 files
  1. assets/javascripts/templates/pages/offline_tmpl.coffee +1 −1
  2. assets/stylesheets/components/_content.scss +8 −11
  3. assets/stylesheets/components/_header.scss +1 −1
  4. assets/stylesheets/components/_mobile.scss +1 −0
  5. assets/stylesheets/components/_settings.scss +10 −6
  6. assets/stylesheets/components/_sidebar.scss +1 −0
  7. assets/stylesheets/global/_base.scss +1 −0
  8. assets/stylesheets/pages/_support_tables.scss +0 −1
  9. assets/stylesheets/pages/_yii.scss +0 −2
  10. views/app.erb +2 −3
assets/javascripts/templates/pages/offline_tmpl.coffee+1−1
@@ -52,7 +52,7 @@ app.templates.offlineDoc = (doc, status) -> · 51 unmodified lines
52 html = """52 html = """
53 <tr data-slug="#{doc.slug}"#{if outdated then ' class="_highlight"' else ''}>53 <tr data-slug="#{doc.slug}"#{if outdated then ' class="_highlight"' else ''}>
54 <td class="_docs-name _icon-#{doc.icon}">#{doc.fullName}</td>54 <td class="_docs-name _icon-#{doc.icon}">#{doc.fullName}</td>
55 <td class="_docs-size">#{Math.ceil(doc.db_size / 100000) / 10} MB</td>55 <td class="_docs-size">#{Math.ceil(doc.db_size / 100000) / 10}&nbsp;<small>MB</small></td>
56 """56 """
57 57
58 html += if !(status and status.installed)58 html += if !(status and status.installed)
assets/stylesheets/components/_content.scss+8−11
@@ -38,17 +38,12 @@ · 37 unmodified lines
38 margin-top: $headerHeight;38 margin-top: $headerHeight;
39 }39 }
40 40
41 &:after { // padding bottom
42 content: '';
43 display: block;
44 margin-bottom: 1.25rem;
45 }
46
47 &::-webkit-scrollbar { -webkit-appearance: none; }41 &::-webkit-scrollbar { -webkit-appearance: none; }
48 &::-webkit-scrollbar:vertical { width: 14px; }42 &::-webkit-scrollbar:vertical { width: 14px; }
49 &::-webkit-scrollbar:horizontal { height: 14px }43 &::-webkit-scrollbar:horizontal { height: 14px }
50 &::-webkit-scrollbar-button { display: none; }44 &::-webkit-scrollbar-button { display: none; }
51 &::-webkit-scrollbar-track { background: $contentBackground; }45 &::-webkit-scrollbar-track,
46 &::-webkit-scrollbar-corner { background: $contentBackground; }
52 &::-webkit-scrollbar-thumb {47 &::-webkit-scrollbar-thumb {
53 min-height: 2rem;48 min-height: 2rem;
54 background: $scrollbarColor;49 background: $scrollbarColor;
@@ -56,6 +51,7 @@ · 1 unmodified line
56 border: 5px solid $contentBackground;51 border: 5px solid $contentBackground;
57 border-radius: 10px;52 border-radius: 10px;
58 53
54 &:hover,
59 &:active {55 &:active {
60 background-color: $scrollbarColorHover;56 background-color: $scrollbarColorHover;
61 border-width: 4px;57 border-width: 4px;
@@ -229,8 +225,6 @@ · 167 unmodified lines
229 225
230._credits {226._credits {
231 width: 100%;227 width: 100%;
232
233 td:first-child, td:last-child { white-space: nowrap; }
234}228}
235 229
236//230//
@@ -244,7 +238,6 @@ · 7 unmodified lines
244 238
245 th, td {239 th, td {
246 width: 1%;240 width: 1%;
247 white-space: nowrap;
248 241
249 &:first-child { width: auto; }242 &:first-child { width: auto; }
250 &:last-child { width: 12rem; }243 &:last-child { width: 12rem; }
@@ -259,7 +252,11 @@ · 8 unmodified lines
259 @extend %doc-icon;252 @extend %doc-icon;
260}253}
261 254
262._docs-size { text-align: right; }255._docs-size {
256 text-align: right;
257
258 > small { color: $textColorLight; }
259}
263 260
264._docs-tools {261._docs-tools {
265 overflow: hidden;262 overflow: hidden;
assets/stylesheets/components/_header.scss+1−1
@@ -146,7 +146,7 @@ · 145 unmodified lines
146 &:before {146 &:before {
147 position: absolute;147 position: absolute;
148 z-index: 1;148 z-index: 1;
149 top: 1rem;149 top: calc(1rem - 1px);
150 left: 1rem;150 left: 1rem;
151 opacity: .4;151 opacity: .4;
152 pointer-events: none;152 pointer-events: none;
assets/stylesheets/components/_mobile.scss+1−0
@@ -42,6 +42,7 @@ · 41 unmodified lines
42 ._settings { position: static; }42 ._settings { position: static; }
43 ._settings ._sidebar { padding-bottom: $headerHeight; }43 ._settings ._sidebar { padding-bottom: $headerHeight; }
44 ._settings-tabs { display: block; }44 ._settings-tabs { display: block; }
45 ._header ._settings-btn { width: auto; }
45 46
46 // Header47 // Header
47 48
assets/stylesheets/components/_settings.scss+10−6
@@ -22,6 +22,10 @@ · 21 unmodified lines
22 }22 }
23}23}
24 24
25//
26// Settings page
27//
28
25._settings-fieldset {29._settings-fieldset {
26 display: flex;30 display: flex;
27 margin: 1.5rem 0;31 margin: 1.5rem 0;
@@ -68,12 +72,13 @@ · 40 unmodified lines
68 vertical-align: top;72 vertical-align: top;
69 margin-left: .375rem;73 margin-left: .375rem;
70 74
71 &[data-behavior=reset] {75 &[data-behavior="reset"] { color: $textColorRed; }
72 font-size: .75rem;
73 color: $textColorRed;
74 }
75}76}
76 77
78//
79// Footer
80//
81
77._footer {82._footer {
78 position: absolute;83 position: absolute;
79 z-index: $headerZ;84 z-index: $headerZ;
@@ -92,6 +97,7 @@ · 12 unmodified lines
92 97
93._settings-btn {98._settings-btn {
94 display: block;99 display: block;
100 width: 100%;
95 height: 100%;101 height: 100%;
96 line-height: 1.5rem;102 line-height: 1.5rem;
97 padding: 0 .75rem;103 padding: 0 .75rem;
@@ -113,8 +119,6 @@ · 15 unmodified lines
113 }119 }
114}120}
115 121
116._save-btn { width: 100%; }
117
118//122//
119// Header tabs123// Header tabs
120//124//
assets/stylesheets/components/_sidebar.scss+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
27 border: 3px solid $contentBackground;27 border: 3px solid $contentBackground;
28 border-radius: 5px;28 border-radius: 5px;
29 29
30 &:hover,
30 &:active {31 &:active {
31 background-color: $scrollbarColorHover;32 background-color: $scrollbarColorHover;
32 border-width: 2px;33 border-width: 2px;
assets/stylesheets/global/_base.scss+1−0
@@ -126,6 +126,7 @@ th, td { · 125 unmodified lines
126 padding-bottom: -webkit-calc(.3em + 1px);126 padding-bottom: -webkit-calc(.3em + 1px);
127 padding-bottom: calc(.3em + 1px);127 padding-bottom: calc(.3em + 1px);
128 text-align: left;128 text-align: left;
129 white-space: normal !important;
129}130}
130 131
131th {132th {
assets/stylesheets/pages/_support_tables.scss+0−1
@@ -30,7 +30,6 @@ · 29 unmodified lines
30 30
31 td {31 td {
32 padding: .125rem .25rem;32 padding: .125rem .25rem;
33 white-space: nowrap;
34 cursor: default;33 cursor: default;
35 }34 }
36 35
assets/stylesheets/pages/_yii.scss+0−2
@@ -9,6 +9,4 @@ · 8 unmodified lines
9 float: right;9 float: right;
10 color: $textColorLight;10 color: $textColorLight;
11 }11 }
12
13 .param-type-col { white-space: nowrap; }
14}12}
views/app.erb+2−3
@@ -44,13 +44,12 @@ · 43 unmodified lines
44 <svg viewBox="0 0 24 24"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></svg> Back44 <svg viewBox="0 0 24 24"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></svg> Back
45 </button>45 </button>
46 <nav class="_settings-tabs">46 <nav class="_settings-tabs">
47 <a class="_settings-tab active" data-tab="doc-picker" hidden>Docs</a>47 <a class="_settings-tab active" data-tab="doc-picker" hidden>Docs</a><a class="_settings-tab" data-tab="settings" hidden>Settings</a>
48 <a class="_settings-tab" data-tab="settings" hidden>Settings</a>
49 </nav>48 </nav>
50 </div>49 </div>
51 <div class="_sidebar"></div>50 <div class="_sidebar"></div>
52 <div class="_footer">51 <div class="_footer">
53 <button type="submit" class="_settings-btn _save-btn">52 <button type="submit" class="_settings-btn">
54 <svg viewBox="0 0 24 24"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z" /></svg> Save53 <svg viewBox="0 0 24 24"><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z" /></svg> Save
55 </button>54 </button>
56 </div>55 </div>