diff --git a/.gitmodules b/.gitmodules index dba2cdd..7156992 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "proxstar/static/css/csh-material-bootstrap"] - path = proxstar/static/css/csh-material-bootstrap - url = https://github.com/ComputerScienceHouse/csh-material-bootstrap.git [submodule "proxstar/static/noVNC"] path = proxstar/static/noVNC url = https://github.com/novnc/noVNC.git diff --git a/proxstar/static/css/circle.css b/proxstar/static/css/circle.css index 4fceb9d..2b7fcef 100644 --- a/proxstar/static/css/circle.css +++ b/proxstar/static/css/circle.css @@ -1004,62 +1004,39 @@ -o-transform: rotate(360deg); transform: rotate(360deg); } -/*.c100:hover { +.c100:hover { cursor: default; } .c100:hover > span { - width: 3.33em; +/* width: 3.33em; line-height: 3.33em; - font-size: 0.3em; + font-size: 0.3em;*/ color: #307bbb; } -.c100:hover:after { +/*.c100:hover:after { top: 0.04em; left: 0.04em; width: 0.92em; height: 0.92em; }*/ -.c100.dark { - background-color: #777777; -} -.c100.dark .bar, -.c100.dark .fill { - border-color: #c6ff00 !important; -} -.c100.dark > span { - color: #777777; -} -.c100.dark:after { - background-color: #666666; -} -.c100.dark:hover > span { - color: #c6ff00; -} .c100.green .bar, .c100.green .fill { - border-color: #4db53c !important; + border-color: #4caf50 !important; } .c100.green:hover > span { - color: #4db53c; -} -.c100.green.dark .bar, -.c100.green.dark .fill { - border-color: #5fd400 !important; -} -.c100.green.dark:hover > span { - color: #5fd400; + color: #4caf50; } .c100.orange .bar, .c100.orange .fill { - border-color: #dd9d22 !important; + border-color: #ff9800 !important; } .c100.orange:hover > span { - color: #dd9d22; + color: #ff9800; } -.c100.orange.dark .bar, -.c100.orange.dark .fill { - border-color: #e08833 !important; +.c100.red .bar, +.c100.red .fill { + border-color: #e51c23 !important; } -.c100.orange.dark:hover > span { - color: #e08833; +.c100.red:hover > span { + color: #e51c23; } diff --git a/proxstar/static/css/csh-material-bootstrap b/proxstar/static/css/csh-material-bootstrap deleted file mode 160000 index bfeaa12..0000000 --- a/proxstar/static/css/csh-material-bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bfeaa127d622489c5f46bdbb0c931da33f89e25a diff --git a/proxstar/static/css/styles.css b/proxstar/static/css/styles.css index c09a51a..7545f56 100644 --- a/proxstar/static/css/styles.css +++ b/proxstar/static/css/styles.css @@ -1,7 +1,3 @@ -body { - padding-top: 100px; -} - footer { text-align: center; margin: 20px 0; @@ -11,6 +7,10 @@ table, th, td { border: 1px solid black; } +.content { + padding-top: 20px; +} + .panel { text-align: center; } @@ -47,6 +47,7 @@ table, th, td { .nav-list { text-align: left; + display: block; } .nav-list .nav-header { @@ -65,31 +66,14 @@ table, th, td { margin-top: 5px; } -.proxstar-ejectbtn { +.proxstar-vmbtn { width: 20px; height: 20px; text-align: center; - padding: 0px 1px 0px 0px; + padding: 1px 0px 0px 0px; border-radius: 15px; } -.proxstar-changebtn { - width: 20px; - height: 20px; - text-align: center; - padding: 0px 0px 0px 1px; - border-radius: 15px; -} - -.proxstar-renewbtn { - width: 20px; - height: 20px; - text-align: center; - padding: 0px 0px 0px 0px; - border-radius: 15px; - line-height: 1; -} - .proxstar-poolbtn { padding: 0; width: 55px; diff --git a/proxstar/templates/base.html b/proxstar/templates/base.html index ffc1436..53ed98a 100644 --- a/proxstar/templates/base.html +++ b/proxstar/templates/base.html @@ -6,102 +6,82 @@ - +
{% block nav %} -