diff --git a/clientapp/templates/main.html b/clientapp/templates/main.html index e9b3ae5..d4c08ff 100644 --- a/clientapp/templates/main.html +++ b/clientapp/templates/main.html @@ -11,7 +11,7 @@

Connecting...

- Cancel + Cancel
diff --git a/public/css/app/aux.styl b/public/css/app/aux.styl index 3e742f1..e7aa9d9 100644 --- a/public/css/app/aux.styl +++ b/public/css/app/aux.styl @@ -24,6 +24,10 @@ h2 padding: 0 + .button + float: none + margin-top: 20px + .head, .content padding: 0 20px diff --git a/public/css/app/forms.styl b/public/css/app/forms.styl index 8c111bc..57c411a 100644 --- a/public/css/app/forms.styl +++ b/public/css/app/forms.styl @@ -59,4 +59,7 @@ button, a.button cursor: pointer &:hover - background: darken($activeBlue, 30%) \ No newline at end of file + background: darken($activeBlue, 30%) + +.enableAlerts + margin-right: 5px \ No newline at end of file diff --git a/public/css/app/settings.styl b/public/css/app/settings.styl index c5b402b..37da7e2 100644 --- a/public/css/app/settings.styl +++ b/public/css/app/settings.styl @@ -12,6 +12,7 @@ padding: 5px background: $grayBackground roundall(3px) + font-size: $fontSmall .uploadRegion padding: 15px @@ -26,3 +27,6 @@ input width: 100% + + img + margin: 10px 0 diff --git a/public/css/otalk.css b/public/css/otalk.css index b5919e9..91085f0 100644 --- a/public/css/otalk.css +++ b/public/css/otalk.css @@ -859,6 +859,7 @@ h3 { -o-border-radius: 3px; -border-radius: 3px; border-radius: 3px; + font-size: 12px; } .uploadRegion { padding: 15px; @@ -879,6 +880,9 @@ h3 { .uploadRegion input { width: 100%; } +.uploadRegion img { + margin: 10px 0; +} .aux { background: #f7f7f7; } @@ -910,6 +914,10 @@ h3 { .box.connect h2 { padding: 0; } +.box.connect .button { + float: none; + margin-top: 20px; +} .box .head, .box .content { padding: 0 20px; @@ -1020,3 +1028,6 @@ button:hover, a.button:hover { background: #007aa7; } +.enableAlerts { + margin-right: 5px; +} diff --git a/public/x-manifest.cache b/public/x-manifest.cache index a840d1c..925d3c3 100644 --- a/public/x-manifest.cache +++ b/public/x-manifest.cache @@ -1,5 +1,5 @@ CACHE MANIFEST -# 0.0.1 1381863218449 +# 0.0.1 1381864437928 CACHE: /app.js