Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Improves home-button design and form-design

Adds a glyphicon icon for the home button, adds some styling and removes
styles which are already implemented in bootstrap. Lastly it writes some
classes in ids in "jade-style" and not inside parentheses.
  • Loading branch information...
commit 20d2334945f6b8a7d1c1e7a2982b446f86501226 1 parent 9125abb
@hermansc hermansc authored
Showing with 35 additions and 21 deletions.
  1. +6 −10 assets/css/subway.css
  2. +29 −11 views/templates.jade
View
16 assets/css/subway.css
@@ -61,9 +61,8 @@ html { overflow: hidden; }
border: 2px solid #DDD;
}
-#overview label { width: 70px; }
-#overview .controls { margin-left: 90px; }
-#overview button { margin-left: 90px; }
+#overview label { width: 100px; text-align: left}
+#overview .controls { margin-left: 100px; }
#overview ul li {
display: inline-block;
@@ -93,18 +92,15 @@ html { overflow: hidden; }
width: 100%;
}
-#overview #home {
- color: black;
- font-weight: bold;
- float: right;
- cursor: pointer;
-}
-
#overview form #loading_image{
position: fixed;
margin-left: 10px;
}
+#chrome-notifications-allow-button {
+ white-space: normal;
+}
+
#user-box {
margin-top: 10px;
background: #434950;
View
40 views/templates.jade
@@ -42,7 +42,9 @@ script(id="overview", type="text/html")
script(id="overview_connection", type="text/html")
#home_parent
- a.overview_button#home Home
+ a.overview_button.btn.btn-default.pull-right#home
+ i.icon-home.spacing-right
+ span Go back
form.form-inline
.control-group
label(for="connect-nick") Nick
@@ -51,7 +53,7 @@ script(id="overview_connection", type="text/html")
label(for="connect-server") Server
input#connect-server(type="text")
.control-group
- label(for="connect-password") Password (optional)
+ label(for="connect-password") Server password (optional)
input#connect-password(type="password")
.control-group
label(for="connect-realName") Real Name
@@ -102,22 +104,36 @@ script(id="overview_connection", type="text/html")
input#connect-stripColors(type="checkbox")
.control-group
{{#loggedIn}}
- label.checkbox(for="connect-keep-alive", style="width:100%") Keep connection alive after browser closed
- input#connect-keep-alive(type="checkbox")
+ label.checkbox(for="connect-keep-alive", style="width:75%") Keep connection alive after browser closed
+ input#connect-keep-alive(type="checkbox")
{{/loggedIn}}
- a(id="connect-button", class="btn btn-primary spacing-right", type="button") Connect
- a(id="connect-more-options-button", class="btn", type="button") More Options
+ .control-group
+ .controls
+ button#connect-button.btn.btn-primary.spacing-right(type="button") Connect
+ button#connect-more-options-button.btn.btn-default.spacing-right(type="button") More Options
script(id="overview_settings", type="text/html")
#home_parent
- a.overview_button#home Home
- p#settings-soon Coming soon.
+ a.overview_button.btn.btn-default.pull-right#home
+ i.icon-home.spacing-right
+ span Go back
+ {{^loggedIn}}
+ .alert.alert-info
+ h4 Tip
+ p
+ a.overview_button#login(href="#home") Log in
+ | in order to save your settings, keep persistent connections and much more!
+ {{/loggedIn}}
p#settings-chrome-notifications
- a(id="chrome-notifications-allow-button", class="btn btn-success", onclick="javascript:window.webkitNotifications.requestPermission();") Enable chrome desktop notifications (will ask for permission)
+ a.btn.btn-small.btn-success#chrome-notifications-allow-button(
+ onclick="javascript:window.webkitNotifications.requestPermission();")
+ | Enable chrome desktop notifications (will ask for permission)
script(id="overview_login", type="text/html")
#home_parent
- a.overview_button#home Home
+ a.overview_button.btn.btn-default.pull-right#home
+ i.icon-home.spacing-right
+ span Go back
form.form-horizontal
.control-group
label.control-label(for="login-username") Username
@@ -135,7 +151,9 @@ script(id="overview_login", type="text/html")
script(id="overview_register", type="text/html")
#home_parent
- a.overview_button#home Home
+ a.overview_button.btn.btn-default.pull-right#home
+ i.icon-home.spacing-right
+ span Go back
form.form-horizontal
.control-group
label.control-label(for="register-username") Username
Please sign in to comment.
Something went wrong with that request. Please try again.