From f6113cdc7877a6cad88a46b47ca2718bbc6f371b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sep 25 2018 16:59:41 +0000 Subject: [frontend] split style-overwrite.css into two parts The 'copr-flavor.css' is newly part of the flavor package (and always generated), while 'style-overwrite.css' is meant to be copr-specific override CSS for defaults set by patternfly. --- diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec index 9aa05c6..9839cf4 100644 --- a/frontend/copr-frontend.spec +++ b/frontend/copr-frontend.spec @@ -11,7 +11,7 @@ # changing the version we make the package explicitly incompatible and # third-party flavor providers are notified they have to update their packages, # too. -%global flavor_guard %name-flavor = 2 +%global flavor_guard %name-flavor = 3 %global flavor_provides Provides: %flavor_guard %global flavor_files_list %_datadir/copr/copr-flavor-filelist %global flavor_generator %_datadir/copr/coprs_frontend/generate_colorscheme @@ -22,7 +22,7 @@ %staticdir/header_background.png \ %staticdir/favicon.ico \ %staticdir/copr_logo.png \ -%staticdir/css/style-overwrite.css \ +%staticdir/css/copr-flavor.css \ %templatedir/project_info.html \ %templatedir/user_meta.html \ %templatedir/welcome.html \ diff --git a/frontend/coprs_frontend/coprs/static/css/copr-flavor.css b/frontend/coprs_frontend/coprs/static/css/copr-flavor.css new file mode 100644 index 0000000..a66f052 --- /dev/null +++ b/frontend/coprs_frontend/coprs/static/css/copr-flavor.css @@ -0,0 +1,2 @@ +/* NEVER edit this file manually, it's generated by ./coprs_frontend/generate_colorscheme */ +a{color:#2b64b4}a:hover,a:focus{color:#214d8b}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active{color:#214d8b}h3 a{color:#214d8b !important}.btn-primary{background-color:#214d8b;background-image:linear-gradient(to bottom, #2b64b4 0, #214d8b 100%);border-color:#2b64b4}.btn-primary:hover,.btn-primary:focus{background-color:#558bd7;border-color:#558bd7}table.datatable thead .sorting_asc,table.datatable thead .sorting_desc{color:#214d8b !important} \ No newline at end of file diff --git a/frontend/coprs_frontend/coprs/static/css/style-overwrite.css b/frontend/coprs_frontend/coprs/static/css/style-overwrite.css index d393bcd..cf958ae 100644 --- a/frontend/coprs_frontend/coprs/static/css/style-overwrite.css +++ b/frontend/coprs_frontend/coprs/static/css/style-overwrite.css @@ -1,4 +1,4 @@ -a{color:#2b64b4}a:hover,a:focus{color:#214d8b}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active{color:#214d8b}h3 a{color:#214d8b !important}.btn-primary{background-color:#214d8b;background-image:linear-gradient(to bottom, #2b64b4 0, #214d8b 100%);border-color:#2b64b4}.btn-primary:hover,.btn-primary:focus{background-color:#558bd7;border-color:#558bd7}table.datatable thead .sorting_asc,table.datatable thead .sorting_desc{color:#214d8b !important}.footer dd ul{padding-left:0;list-style:none} +.footer dd ul{padding-left:0;list-style:none} .list-group-item-heading{font-weight:700} pre{background-color:#f8f8f8;padding: 9.5px 9.5px 0px 9.5px;} pre code div {margin-bottom:-11px; margin-top:-2px; font-size:12px} diff --git a/frontend/coprs_frontend/coprs/templates/layout.html b/frontend/coprs_frontend/coprs/templates/layout.html index a54b3da..b5def5e 100644 --- a/frontend/coprs_frontend/coprs/templates/layout.html +++ b/frontend/coprs_frontend/coprs/templates/layout.html @@ -27,6 +27,7 @@ + diff --git a/frontend/coprs_frontend/generate_colorscheme b/frontend/coprs_frontend/generate_colorscheme index ec5db86..05320bd 100755 --- a/frontend/coprs_frontend/generate_colorscheme +++ b/frontend/coprs_frontend/generate_colorscheme @@ -25,7 +25,9 @@ done mkdir -p "$opt_static_files/css" -cat <