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
5252 html = """
5353 <tr data-slug="#{doc.slug}"#{if outdated then ' class="_highlight"' else ''}>
5454 <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>
5656 """
5757
5858 html += if !(status and status.installed)
assets/stylesheets/components/_content.scss+8−11
@@ -38,17 +38,12 @@ · 37 unmodified lines
3838 margin-top: $headerHeight;
3939 }
4040
41− &:after { // padding bottom
42− content: '';
43− display: block;
44− margin-bottom: 1.25rem;
45− }
46−
4741 &::-webkit-scrollbar { -webkit-appearance: none; }
4842 &::-webkit-scrollbar:vertical { width: 14px; }
4943 &::-webkit-scrollbar:horizontal { height: 14px }
5044 &::-webkit-scrollbar-button { display: none; }
51− &::-webkit-scrollbar-track { background: $contentBackground; }
45+ &::-webkit-scrollbar-track,
46+ &::-webkit-scrollbar-corner { background: $contentBackground; }
5247 &::-webkit-scrollbar-thumb {
5348 min-height: 2rem;
5449 background: $scrollbarColor;
@@ -56,6 +51,7 @@ · 1 unmodified line
5651 border: 5px solid $contentBackground;
5752 border-radius: 10px;
5853
54+ &:hover,
5955 &:active {
6056 background-color: $scrollbarColorHover;
6157 border-width: 4px;
@@ -229,8 +225,6 @@ · 167 unmodified lines
229225
230226 ._credits {
231227 width: 100%;
232−
233− td:first-child, td:last-child { white-space: nowrap; }
234228 }
235229
236230 //
@@ -244,7 +238,6 @@ · 7 unmodified lines
244238
245239 th, td {
246240 width: 1%;
247− white-space: nowrap;
248241
249242 &:first-child { width: auto; }
250243 &:last-child { width: 12rem; }
@@ -259,7 +252,11 @@ · 8 unmodified lines
259252 @extend %doc-icon;
260253 }
261254
262−._docs-size { text-align: right; }
255+._docs-size {
256+ text-align: right;
257+
258+ > small { color: $textColorLight; }
259+}
263260
264261 ._docs-tools {
265262 overflow: hidden;
assets/stylesheets/components/_header.scss+1−1
@@ -146,7 +146,7 @@ · 145 unmodified lines
146146 &:before {
147147 position: absolute;
148148 z-index: 1;
149− top: 1rem;
149+ top: calc(1rem - 1px);
150150 left: 1rem;
151151 opacity: .4;
152152 pointer-events: none;
assets/stylesheets/components/_mobile.scss+1−0
@@ -42,6 +42,7 @@ · 41 unmodified lines
4242 ._settings { position: static; }
4343 ._settings ._sidebar { padding-bottom: $headerHeight; }
4444 ._settings-tabs { display: block; }
45+ ._header ._settings-btn { width: auto; }
4546
4647 // Header
4748
assets/stylesheets/components/_settings.scss+10−6
@@ -22,6 +22,10 @@ · 21 unmodified lines
2222 }
2323 }
2424
25+//
26+// Settings page
27+//
28+
2529 ._settings-fieldset {
2630 display: flex;
2731 margin: 1.5rem 0;
@@ -68,12 +72,13 @@ · 40 unmodified lines
6872 vertical-align: top;
6973 margin-left: .375rem;
7074
71− &[data-behavior=reset] {
72− font-size: .75rem;
73− color: $textColorRed;
74− }
75+ &[data-behavior="reset"] { color: $textColorRed; }
7576 }
7677
78+//
79+// Footer
80+//
81+
7782 ._footer {
7883 position: absolute;
7984 z-index: $headerZ;
@@ -92,6 +97,7 @@ · 12 unmodified lines
9297
9398 ._settings-btn {
9499 display: block;
100+ width: 100%;
95101 height: 100%;
96102 line-height: 1.5rem;
97103 padding: 0 .75rem;
@@ -113,8 +119,6 @@ · 15 unmodified lines
113119 }
114120 }
115121
116−._save-btn { width: 100%; }
117−
118122 //
119123 // Header tabs
120124 //
assets/stylesheets/components/_sidebar.scss+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 border: 3px solid $contentBackground;
2828 border-radius: 5px;
2929
30+ &:hover,
3031 &:active {
3132 background-color: $scrollbarColorHover;
3233 border-width: 2px;
assets/stylesheets/global/_base.scss+1−0
@@ -126,6 +126,7 @@ th, td { · 125 unmodified lines
126126 padding-bottom: -webkit-calc(.3em + 1px);
127127 padding-bottom: calc(.3em + 1px);
128128 text-align: left;
129+ white-space: normal !important;
129130 }
130131
131132 th {
assets/stylesheets/pages/_support_tables.scss+0−1
@@ -30,7 +30,6 @@ · 29 unmodified lines
3030
3131 td {
3232 padding: .125rem .25rem;
33− white-space: nowrap;
3433 cursor: default;
3534 }
3635
assets/stylesheets/pages/_yii.scss+0−2
@@ -9,6 +9,4 @@ · 8 unmodified lines
99 float: right;
1010 color: $textColorLight;
1111 }
12−
13− .param-type-col { white-space: nowrap; }
1412 }
views/app.erb+2−3
@@ -44,13 +44,12 @@ · 43 unmodified lines
4444 <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
4545 </button>
4646 <nav class="_settings-tabs">
47− <a class="_settings-tab active" data-tab="doc-picker" hidden>Docs</a>
48− <a class="_settings-tab" data-tab="settings" hidden>Settings</a>
47+ <a class="_settings-tab active" data-tab="doc-picker" hidden>Docs</a><a class="_settings-tab" data-tab="settings" hidden>Settings</a>
4948 </nav>
5049 </div>
5150 <div class="_sidebar"></div>
5251 <div class="_footer">
53− <button type="submit" class="_settings-btn _save-btn">
52+ <button type="submit" class="_settings-btn">
5453 <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
5554 </button>
5655 </div>