diff --git a/assets/styles/nardah-old.scss b/assets/styles/nardah-old.scss new file mode 100644 index 0000000..7d441db --- /dev/null +++ b/assets/styles/nardah-old.scss @@ -0,0 +1,147 @@ +$primary-color: navy; +$primary-color-highlight: lighten($primary-color, 10%); + +$nav-height: 65px; + +$textarea-min-height: 100px; + +$shadow-normal: rgba(17, 12, 46, 0.15) 0px 48px 100px 0px; +$shadow-light: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; +$shadow-heavy: rgba(0, 0, 0, 0.25) 0px 54px 55px, rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px; + +body{ + margin: 0; + padding: $nav-height 0 0; + background: #f6f6f6; + font-size: 16px; +} + +a{ + color: $primary-color; + transition: all 230ms ease-in-out; + &:hover{ + color: $primary-color-highlight; + } +} + +table{ + border: 1px solid #e1e1e1; + border-collapse: collapse; + box-shadow: $shadow-light; + border-radius: 7px; + overflow: hidden; + + thead{ + border-bottom: 2px solid #212121; + font-size: 2rem; + } + + tr, + th, + td{ + border: none; + } + + tr:nth-child(even){ + background-color: #eee; + } + + th, + td{ + padding: 12px 15px !important; + } +} + +textarea{ + min-width: 100%; + max-width: 100%; + min-height: $textarea-min-height; +} + +input[type=submit].button-primary, +button.button-primary, +.button.button-primary{ + background-color: $primary-color; + font-size: 1.5rem; + + &:hover{ + background-color: lighten($primary-color, 10%); + } +} + +select[multiple]{ + max-width: 100%; + min-height: 100px; +} + +#main-nav{ + position: fixed; + top: 0; + left: 0; + width: 100%; + height: $nav-height; + background: $primary-color; + box-shadow: $shadow-normal; + color: #eee; + font-size: 2rem; + z-index: 100; + + ul{ + list-style: none; + li{ + display: inline-block; + } + } + + .nav-left{ + float: left; + } + .nav-right{ + float: right; + } + + a{ + display: inline-block; + padding: 15px 10px; + color: #eee; + font-weight: bold; + text-decoration: none; + &:hover{ + color: white; + } + } + + .site-logo{ + margin-left: 25px; + margin-right: 25px; + font-weight: bold; + } +} + +#main-wrapper{ + max-width: 1180px; + margin-top: 15px; + padding: 15px 20px; + background-color: white; + box-shadow: $shadow-normal; + border-radius: 10px; +} + +#main-footer{ + margin-top: 25px; + + p{ + margin-bottom: 5px; + text-align: center; + } +} + +#result-form{ + margin: 0; + + button, + input, + select{ + margin: 0; + } +} diff --git a/assets/styles/nardah.scss b/assets/styles/nardah.scss index 7d441db..39ef12c 100644 --- a/assets/styles/nardah.scss +++ b/assets/styles/nardah.scss @@ -10,138 +10,5 @@ $shadow-light: rgba(99, 99, 99, 0.2) 0px 2px 8px 0px; $shadow-heavy: rgba(0, 0, 0, 0.25) 0px 54px 55px, rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px; body{ - margin: 0; - padding: $nav-height 0 0; - background: #f6f6f6; - font-size: 16px; -} - -a{ - color: $primary-color; - transition: all 230ms ease-in-out; - &:hover{ - color: $primary-color-highlight; - } -} - -table{ - border: 1px solid #e1e1e1; - border-collapse: collapse; - box-shadow: $shadow-light; - border-radius: 7px; - overflow: hidden; - - thead{ - border-bottom: 2px solid #212121; - font-size: 2rem; - } - - tr, - th, - td{ - border: none; - } - - tr:nth-child(even){ - background-color: #eee; - } - - th, - td{ - padding: 12px 15px !important; - } -} - -textarea{ - min-width: 100%; - max-width: 100%; - min-height: $textarea-min-height; -} - -input[type=submit].button-primary, -button.button-primary, -.button.button-primary{ - background-color: $primary-color; - font-size: 1.5rem; - - &:hover{ - background-color: lighten($primary-color, 10%); - } -} - -select[multiple]{ - max-width: 100%; - min-height: 100px; -} - -#main-nav{ - position: fixed; - top: 0; - left: 0; - width: 100%; - height: $nav-height; - background: $primary-color; - box-shadow: $shadow-normal; - color: #eee; - font-size: 2rem; - z-index: 100; - - ul{ - list-style: none; - li{ - display: inline-block; - } - } - - .nav-left{ - float: left; - } - .nav-right{ - float: right; - } - - a{ - display: inline-block; - padding: 15px 10px; - color: #eee; - font-weight: bold; - text-decoration: none; - &:hover{ - color: white; - } - } - - .site-logo{ - margin-left: 25px; - margin-right: 25px; - font-weight: bold; - } -} - -#main-wrapper{ - max-width: 1180px; - margin-top: 15px; - padding: 15px 20px; - background-color: white; - box-shadow: $shadow-normal; - border-radius: 10px; -} - -#main-footer{ - margin-top: 25px; - - p{ - margin-bottom: 5px; - text-align: center; - } -} - -#result-form{ - margin: 0; - - button, - input, - select{ - margin: 0; - } + font-size: 18px; } diff --git a/views/benchmark/add.twig b/views/benchmark/add.twig index 02b86b4..fb28183 100644 --- a/views/benchmark/add.twig +++ b/views/benchmark/add.twig @@ -4,43 +4,39 @@ {% block content %} -
-
+
+

Add new benchmark

-
-
-
-
- - -
- -
- -
+ +
+
+ +
-
-
- - -
+
+ +
+
- - -
+
+
+ + +
+
+ + +
{% endblock %} diff --git a/views/benchmark/edit.twig b/views/benchmark/edit.twig index c224079..9b8cc96 100644 --- a/views/benchmark/edit.twig +++ b/views/benchmark/edit.twig @@ -4,43 +4,39 @@ {% block content %} -
-
+
+

Editing Benchmark: {{ benchmark.name }}

-
-
-
-
- - -
- -
- -
+ +
+
+ +
-
-
- - -
+
+ +
+
- - -
+
+
+ + +
+
+ + +
{% endblock %} diff --git a/views/benchmark/list.twig b/views/benchmark/list.twig index 0077847..d3f422f 100644 --- a/views/benchmark/list.twig +++ b/views/benchmark/list.twig @@ -6,8 +6,8 @@

Create new Benchmark

{% if benchmarks | length > 0 %} - - +
+ diff --git a/views/benchmark/view.twig b/views/benchmark/view.twig index 5cc6267..4a02d5b 100644 --- a/views/benchmark/view.twig +++ b/views/benchmark/view.twig @@ -4,7 +4,7 @@ {% block content %}
-
+

{{ benchmark.name }}

Edit

{{ benchmark.description }}

@@ -14,12 +14,12 @@
-
-

Tests using this benchmark:

+
+

Tests using this benchmark:

{% if benchmark.tests | length > 0 %} -
Benchmark name Description
- +
+ diff --git a/views/component/add.twig b/views/component/add.twig index 53008c5..500e528 100644 --- a/views/component/add.twig +++ b/views/component/add.twig @@ -4,33 +4,31 @@ {% block content %} -
-
+
+

Add new component

-
-
-
-
- - +
+ +
+
+ +
-
- +
+ +
- +
diff --git a/views/component/edit.twig b/views/component/edit.twig index cf7bd1b..ad02d99 100644 --- a/views/component/edit.twig +++ b/views/component/edit.twig @@ -4,35 +4,31 @@ {% block content %} -
-
+
+

Editing Component: {{ component.name }}

-
+
-
-
- +
+
+ +
-
- +
+ +
- +
diff --git a/views/component/list.twig b/views/component/list.twig index 06aeb9f..93fca33 100644 --- a/views/component/list.twig +++ b/views/component/list.twig @@ -6,8 +6,8 @@

Create new Hardware Component

{% if components | length > 0 %} -
Test title Benchmarks
- +
+ diff --git a/views/component/view.twig b/views/component/view.twig index fa13069..195ca02 100644 --- a/views/component/view.twig +++ b/views/component/view.twig @@ -4,7 +4,7 @@ {% block content %}
-
+

{{ component.name }}

Edit

{{ component.type }}

@@ -14,12 +14,12 @@
-
+

Tests using this component:

{% if component.tests | length > 0 %} -
Component name Type
- +
+ diff --git a/views/index.twig b/views/index.twig index 0c75999..895673c 100644 --- a/views/index.twig +++ b/views/index.twig @@ -5,7 +5,7 @@ {% block content %}
-
+

Welcome to Colossus!

Using Colossus, you can easily organize your hardware benchmark results.

@@ -14,7 +14,7 @@
-
+

View current tests

Add a new test

diff --git a/views/layout.twig b/views/layout.twig index ced1117..befb482 100644 --- a/views/layout.twig +++ b/views/layout.twig @@ -4,15 +4,16 @@ {% block title %}{% endblock %} | Colossus - + + {% include 'partials/navbar.twig' %} -
+
{% block content %}{% endblock %}
diff --git a/views/partials/footer.twig b/views/partials/footer.twig index 90c7b12..fbac892 100644 --- a/views/partials/footer.twig +++ b/views/partials/footer.twig @@ -1,6 +1,6 @@
-
+

Colossus version {{ APP_VERSION }}.

Running PHP version {{ PHP_VERSION }}.

diff --git a/views/partials/navbar.twig b/views/partials/navbar.twig index f58a2b6..fb51a4b 100644 --- a/views/partials/navbar.twig +++ b/views/partials/navbar.twig @@ -1,12 +1,29 @@ -
Test title Benchmarks
- +
+ diff --git a/views/test/view.twig b/views/test/view.twig index ddf8672..d2e1b56 100644 --- a/views/test/view.twig +++ b/views/test/view.twig @@ -3,39 +3,39 @@ {% block title %}Test: {{ test.title }}{% endblock %} {% block content %} -
-
+
+

{{ test.title }}

{{ test.description }}

-
+
-
-
-
+
+
+
-
- {% for b in test.benchmarks %} {% endfor %}
-
- +
+
-
- +
+
-
- +
+
-
- +
+
@@ -45,14 +45,14 @@
-
+
-
-

Benchmark results:

+
+

Benchmark results:

-
Test title Hardware
- +
+
Benchmark Scoring