From eede3b16137cf041e1fbde55da32dc5676d48662 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Tue, 26 May 2015 22:58:48 -0700 Subject: [PATCH] improved styling for range slider, repo page --- .../static/scripts/controllers/repos.js | 3 +- .../static/scripts/views/repos.html | 2 +- .../static/scripts/views/repos_edit.html | 3 +- .../static/scripts/views/users.html | 16 ++- cmd/drone-server/static/styles/drone.css | 120 +++++++++++++++++- 5 files changed, 134 insertions(+), 10 deletions(-) diff --git a/cmd/drone-server/static/scripts/controllers/repos.js b/cmd/drone-server/static/scripts/controllers/repos.js index 52106f2d3..4c26ee455 100644 --- a/cmd/drone-server/static/scripts/controllers/repos.js +++ b/cmd/drone-server/static/scripts/controllers/repos.js @@ -30,7 +30,7 @@ users.getCached().then(function(payload){ $scope.user = payload.data; }); - + $scope.add = function(slug) { repos.post(slug).then(function(payload) { $location.path('/'+slug); @@ -64,6 +64,7 @@ }); $scope.save = function(repo) { + repo.timeout = parseInt(repo.timeout); repos.update(repo).then(function(payload) { $scope.repo = payload.data; }).catch(function(err){ diff --git a/cmd/drone-server/static/scripts/views/repos.html b/cmd/drone-server/static/scripts/views/repos.html index 2784f7869..ceb9be6de 100644 --- a/cmd/drone-server/static/scripts/views/repos.html +++ b/cmd/drone-server/static/scripts/views/repos.html @@ -22,7 +22,7 @@
-
 
+

{{ repo.owner }} / {{ repo.name }}

diff --git a/cmd/drone-server/static/scripts/views/repos_edit.html b/cmd/drone-server/static/scripts/views/repos_edit.html index c6fd134a0..b22e78966 100644 --- a/cmd/drone-server/static/scripts/views/repos_edit.html +++ b/cmd/drone-server/static/scripts/views/repos_edit.html @@ -54,7 +54,8 @@
Timeout in minutes
- + + {{ repo.timeout }} minutes
diff --git a/cmd/drone-server/static/scripts/views/users.html b/cmd/drone-server/static/scripts/views/users.html index d0f0ee866..41e251a88 100644 --- a/cmd/drone-server/static/scripts/views/users.html +++ b/cmd/drone-server/static/scripts/views/users.html @@ -14,6 +14,15 @@
+ +
+
+ + + +
+
+
@@ -39,10 +48,5 @@
-
-
- - -
-
+
diff --git a/cmd/drone-server/static/styles/drone.css b/cmd/drone-server/static/styles/drone.css index 06f3ffa05..3344dbe84 100644 --- a/cmd/drone-server/static/styles/drone.css +++ b/cmd/drone-server/static/styles/drone.css @@ -1409,6 +1409,25 @@ section .build-row > div:last-child { font-family: Material-Design-Iconic-Font; } +section .icon { + background:#BDBDBD; + display: inline-block; + width: 40px; + height: 40px; + line-height: 40px; + border-radius: 50%; + color: rgba(255,255,255,0.9); + font-size: 16px; + text-align: center; +} +section .icon-repo:after { + font-size: 18px; + content: '\f001'; + color: rgba(255, 255, 255, 0.701961); + width: 24px; + font-family: "octicons"; +} + section .build-row > div:first-child { width:70px; min-width: 70px; @@ -1556,7 +1575,6 @@ input:checked + .switch:active::before { /* -*/ header { background:transparent; @@ -1596,3 +1614,103 @@ article { .menu .nav-item:after { color: #2f2f2f !important; } + +*/ + +.slider-label { + display:none; + margin-left:10px; +} +input[type="range"]:focus ~ .slider-label { + display:inline-block; +} + + +input[type=range] { + -webkit-appearance: none; + margin: 6px 0; + width: 200px; +} +input[type=range]:focus { + outline: none; +} +input[type=range]::-webkit-slider-runnable-track { + width: 100%; + height: 8px; + cursor: pointer; + animate: 0.2s; + box-shadow: none; + background: rgba(0,150,136,0.5); + border-radius: 5px; + border: none; +} +input[type=range]::-webkit-slider-thumb { + box-shadow: none; + border: none; + height: 26px; + width: 26px; + border-radius: 50px; + background: #009688; + cursor: pointer; + -webkit-appearance: none; + margin-top: -10px; +} +input[type=range]:focus::-webkit-slider-runnable-track { + background: rgba(0,150,136,0.5); +} +input[type=range]::-moz-range-track { + width: 100%; + height: 8px; + cursor: pointer; + animate: 0.2s; + box-shadow: none; + background: rgba(0,150,136,0.5); + border-radius: 5px; + border: none; +} +input[type=range]::-moz-range-thumb { + box-shadow: none; + border: none; + height: 26px; + width: 26px; + border-radius: 50px; + background: #009688; + cursor: pointer; +} +input[type=range]::-ms-track { + width: 100%; + height: 8.4px; + cursor: pointer; + animate: 0.2s; + background: transparent; + border-color: transparent; + border-width: 16px 0; + color: transparent; +} +input[type=range]::-ms-fill-lower { + background: #2a6495; + border: 0.2px solid #010101; + border-radius: 2.6px; + box-shadow: 1px 1px 1px #000000, 0px 0px 1px #0d0d0d; +} +input[type=range]::-ms-fill-upper { + background: #3071a9; + border: 0.2px solid #010101; + border-radius: 2.6px; + box-shadow: 1px 1px 1px #000000, 0px 0px 1px #0d0d0d; +} +input[type=range]::-ms-thumb { + box-shadow: 1px 1px 1px #000000, 0px 0px 1px #0d0d0d; + border: 1px solid #000000; + height: 36px; + width: 16px; + border-radius: 3px; + background: #ffffff; + cursor: pointer; +} +input[type=range]:focus::-ms-fill-lower { + background: #3071a9; +} +input[type=range]:focus::-ms-fill-upper { + background: #367ebd; +}