From ddee68281ac16226532bb86886442429a7b731d8 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 3 Jun 2021 17:59:26 -0500 Subject: [PATCH 01/22] =?UTF-8?q?GH-245:=20v1=E2=80=93v2=20Migration=20Fix?= =?UTF-8?q?=20(Source=20FIles)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1-to-v2/angular-material.1.1.8.css | 42 ++ .../v1-to-v2/bootstrap.3.3.7.cepv2.css | 4 + .../_migrations/v1-to-v2/bootstrap.3.3.7.css | 435 ++++++++++++++++++ .../src/_migrations/v1-to-v2/main.portal.css | 21 + 4 files changed, 502 insertions(+) create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/angular-material.1.1.8.css create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.css create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/angular-material.1.1.8.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/angular-material.1.1.8.css new file mode 100644 index 000000000..d4a4ed12c --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/angular-material.1.1.8.css @@ -0,0 +1,42 @@ +/* +NOTE: Relevant styles for Pre-2020 AngularJS Material Design + - How: https://developers.google.com/web/tools/chrome-devtools/coverage + - How: Include code that _is being_ used + - How: Include code that _could be_ used (because it is generic enough) + - `[tabindex="-1"]:focus` + - Source CSS: https://ajax.googleapis.com/ajax/libs/angular_material/1.1.8/angular-material.min.css +*/ + +/*! + * AngularJS Material Design + * https://github.com/angular/material + * @license MIT + * v1.1.8 + */ +body, +html { + height: 100%; + position: relative; +} +body { + margin: 0; + padding: 0; +} +[tabindex="-1"]:focus { + outline: none; +} + +/* … */ + +body, +html { + -webkit-tap-highlight-color:transparent; + -webkit-touch-callout:none; + min-height:100%; + -webkit-text-size-adjust:100%; + -ms-text-size-adjust:100%; + -webkit-font-smoothing:antialiased; + -moz-osx-font-smoothing:grayscale +} + +/* … */ diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css new file mode 100644 index 000000000..2fabb13e3 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css @@ -0,0 +1,4 @@ +/* To overwrite problem code from `main.bootstrap.3.3.7.css` */ +html { + font-size: 16px; +} diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.css new file mode 100644 index 000000000..5dd87a366 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.css @@ -0,0 +1,435 @@ +/* +NOTE: Relevant styles for Pre-2020 Bootstrap 3.3.7 + - How: https://developers.google.com/web/tools/chrome-devtools/coverage + - How: Include code that _is being_ used + - How: Include code that _could be_ used (because it includes used selector) + - `__selector_start__` `__used_selector__` `__selector_end__` + - How: Did NOT incude code that is already in Bootstrap 4.0.0 + - How: Did NOT incude code that represents outdated web practices + - `outline: none` + - Source CSS: https://bitbucket.org/taccaci/frontera/src/master/client/css/bootstrap.min.css +*/ + +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); +/*! + * bootswatch v3.3.7 + * Homepage: http://bootswatch.com + * Copyright 2012-2017 Thomas Park + * Licensed under MIT + * Based on Bootstrap +*//*! + * Bootstrap v3.3.7 (http://getbootstrap.com) + * Copyright 2011-2016 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ + +/* … */ + +b, +strong { + font-weight:bold +} + +/* … */ + +h1 { + font-size:2em; + margin:0.67em 0 +} + +/* … */ + +img { + border:0 +} + +/* … */ + +hr { + -webkit-box-sizing:content-box; + -moz-box-sizing:content-box; + box-sizing:content-box; + height:0 +} + +/* … */ + +button, +input, +optgroup, +select, +textarea { + color:inherit; + font:inherit; + margin:0 +} +button { + overflow:visible +} +button, +select { + text-transform:none +} +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance:button; + cursor:pointer +} +button[disabled], +html input[disabled] { + cursor:default +} +button::-moz-focus-inner, +input::-moz-focus-inner { + border:0; + padding:0 +} +input { + line-height:normal +} +input[type="checkbox"], +input[type="radio"] { + -webkit-box-sizing:border-box; + -moz-box-sizing:border-box; + box-sizing:border-box; + padding:0 +} +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height:auto +} +input[type="search"] { + -webkit-appearance:textfield; + -webkit-box-sizing:content-box; + -moz-box-sizing:content-box; + box-sizing:content-box +} +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance:none +} +fieldset { + border:1px solid #c0c0c0; + margin:0 2px; + padding:0.35em 0.625em 0.75em +} +legend { + border:0; + padding:0 +} +textarea { + overflow:auto +} +optgroup { + font-weight:bold +} +table { + border-collapse:collapse; + border-spacing:0 +} +td, +th { + padding:0 +} + +/* … */ + +html { + font-size:10px; + -webkit-tap-highlight-color:rgba(0,0,0,0) +} +body { + font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; + font-size:15px; + line-height:1.4; + color:#222222; +} + +/* … */ + +a { + color:#008cba; + /* text-decoration:none */ +} +a:hover, +a:focus { + color:#008cba; + /* text-decoration:underline */ +} +a:focus { + outline:5px auto -webkit-focus-ring-color; + outline-offset:-2px +} + +/* … */ + +.img-responsive, +.thumbnail>img, +.thumbnail a>img, +.carousel-inner>.item>img, +.carousel-inner>.item>a>img { + display:block; + max-width:100%; + height:auto +} + +/* … */ + +hr { + margin-top:21px; + margin-bottom:21px; + border:0; + border-top:1px solid #dddddd +} + +/* … */ + +h1, +h2, +h3, +h4, +h5, +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6 { + font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight:300; + line-height:1.1; + /* color:inherit */ +} + +/* … */ + +h1, +.h1, +h2, +.h2, +h3, +.h3 { + margin-top:21px; + margin-bottom:10.5px +} + +/* … */ + +h4, +.h4, +h5, +.h5, +h6, +.h6 { + margin-top:10.5px; + margin-bottom:10.5px +} + +/* … */ + +h1, +.h1 { + font-size:39px +} +h2, +.h2 { + font-size:32px +} +h3, +.h3 { + font-size:26px +} +h4, +.h4 { + font-size:19px +} +h5, +.h5 { + font-size:15px +} +h6, +.h6 { + font-size:13px +} +p { + margin:0 0 10.5px +} + +/* … */ + +.btn { + display:inline-block; + margin-bottom:0; + font-weight:normal; + text-align:center; + vertical-align:middle; + -ms-touch-action:manipulation; + touch-action:manipulation; + cursor:pointer; + background-image:none; + border:1px solid transparent; + white-space:nowrap; + padding:8px 12px; + font-size:15px; + line-height:1.4; + border-radius:0; + -webkit-user-select:none; + -moz-user-select:none; + -ms-user-select:none; + user-select:none +} +.btn:focus, +.btn:active:focus, +.btn.active:focus, +.btn.focus, +.btn:active.focus, +.btn.active.focus { + outline:5px auto -webkit-focus-ring-color; + outline-offset:-2px +} +.btn:hover, +.btn:focus, +.btn.focus { + color:#333333; + text-decoration:none +} +.btn:active, +.btn.active { + outline:0; + background-image:none; + -webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125); + box-shadow:inset 0 3px 5px rgba(0,0,0,0.125) +} +.btn.disabled, +.btn[disabled], +fieldset[disabled] .btn { + cursor:not-allowed; + opacity:0.65; + filter:alpha(opacity=65); + -webkit-box-shadow:none; + box-shadow:none +} +a.btn.disabled, +fieldset[disabled] a.btn { + pointer-events:none +} + +/* … */ + +.btn-primary { + color:#ffffff; + background-color:#008cba; + border-color:#0079a1 +} +.btn-primary:focus, +.btn-primary.focus { + color:#ffffff; + background-color:#006687; + border-color:#001921 +} +.btn-primary:hover { + color:#ffffff; + background-color:#006687; + border-color:#004b63 +} +.btn-primary:active, +.btn-primary.active, +.open>.dropdown-toggle.btn-primary { + color:#ffffff; + background-color:#006687; + border-color:#004b63 +} +.btn-primary:active:hover, +.btn-primary.active:hover, +.open>.dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open>.dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open>.dropdown-toggle.btn-primary.focus { + color:#ffffff; + background-color:#004b63; + border-color:#001921 +} +.btn-primary:active, +.btn-primary.active, +.open>.dropdown-toggle.btn-primary { + background-image:none +} +.btn-primary.disabled:hover, +.btn-primary[disabled]:hover, +fieldset[disabled] .btn-primary:hover, +.btn-primary.disabled:focus, +.btn-primary[disabled]:focus, +fieldset[disabled] .btn-primary:focus, +.btn-primary.disabled.focus, +.btn-primary[disabled].focus, +fieldset[disabled] .btn-primary.focus { + background-color:#008cba; + border-color:#0079a1 +} +.btn-primary .badge { + color:#008cba; + background-color:#ffffff +} + +/* … */ + +.btn-block { + display:block; + width:100% +} +.btn-block+.btn-block { + margin-top:5px +} +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + width:100% +} + +/* … */ + +.label { + display:inline; + padding:.2em .6em .3em; + font-size:75%; + font-weight:bold; + line-height:1; + color:#ffffff; + text-align:center; + white-space:nowrap; + vertical-align:baseline; + border-radius:.25em +} + +/* … */ + +.label:empty { + display:none +} + +/* … */ + +.label-success { + background-color:#43ac6a +} +.label-success[href]:hover, +.label-success[href]:focus { + background-color:#358753 +} + +/* … */ + +.label { + padding-left:1em; + padding-right:1em; + border-radius:0; + font-weight:300 +} + +/* … */ diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css new file mode 100644 index 000000000..b0e705445 --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css @@ -0,0 +1,21 @@ +/* +NOTE: Relevant styles for Pre-2020 `portal.scss` + - How: Manually find and retain code that is still used + - Source CSS: https://fronteraweb.tacc.utexas.edu/static/main.….css + - Source SCSS: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css +*/ + +/* … */ + +body { + font-family: 'Roboto', sans-serif; + /* min-height: 100%; */ + /* position: relative; */ +} + +/* … */ + +footer { + /* … */ + margin-top: 1em; +} From 8d810a0953a8d13365929d58d38cc40d66c5b716 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 4 Jun 2021 15:20:40 -0500 Subject: [PATCH 02/22] GH-245: Standardize Migration Stylesheets --- README.md | 11 ++++++ .../static/site_cms/css/src/README.md | 3 ++ .../site_cms/css/src/_migrations/README.md | 38 +++++++++++++++++++ .../v1-to-v2/bootstrap.3.3.7.cepv2.css | 4 -- .../src/_migrations/v1-to-v2/main.portal.css | 21 ---------- .../angular-material.1.1.8.css | 12 +++--- .../{v1-to-v2 => v1_v2}/bootstrap.3.3.7.css | 20 +++++----- .../css/src/_migrations/v1_v2/fixes.css | 13 +++++++ .../css/src/_migrations/v1_v2/main.portal.css | 21 ++++++++++ .../static/site_cms/css/src/migrate.v1_v2.css | 6 +++ 10 files changed, 109 insertions(+), 40 deletions(-) create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/README.md delete mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css delete mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css rename taccsite_cms/static/site_cms/css/src/_migrations/{v1-to-v2 => v1_v2}/angular-material.1.1.8.css (55%) rename taccsite_cms/static/site_cms/css/src/_migrations/{v1-to-v2 => v1_v2}/bootstrap.3.3.7.css (91%) create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css create mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css create mode 100644 taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css diff --git a/README.md b/README.md index 14f376579..4ae1bf037 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,17 @@ To support multiple instances of the CMS on one machine (i.e. local development) docker-compose -f docker-compose.custom.yml … ``` +### (Optional) Migrate Website from Older Version + +Some websites need static resources to supplement their migration. + +1. Copy `taccsite_cms/templates/fullwidth.html` to `taccsite_custom/name-of-project/templates/fullwidth.html`. +2. Update `taccsite_custom/name-of-project/templates/fullwidth.html` to load migration static resources e.g., in `assets_custom` block add: + + ```html + + ``` + ## Run the CMS ### Prerequisites diff --git a/taccsite_cms/static/site_cms/css/src/README.md b/taccsite_cms/static/site_cms/css/src/README.md index abb4a9601..da85c01d4 100644 --- a/taccsite_cms/static/site_cms/css/src/README.md +++ b/taccsite_cms/static/site_cms/css/src/README.md @@ -23,6 +23,9 @@ _This directory exists in `static/` __only__ because it is customary, using Djan | `site(.*).css` | styles that apply to the entire website i.e. global styles | `template.*.css` | styles that apply only to certain templates | `page.*.css` | styles that apply only to certain pages +| `migrate.*.css` | styles that apply to websites that have been migrated[^1] + +[^1]: When sensible, use the migration folder name, i.e. `migrate.v1_v2.css`. ## Documentation Format diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/README.md b/taccsite_cms/static/site_cms/css/src/_migrations/README.md new file mode 100644 index 000000000..c0fdb63af --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/README.md @@ -0,0 +1,38 @@ +# TACC CMS - Stylesheets - Migrations + +ORGANIZE STYLES HERE! + +These folders' styles are only to be imported by other stylesheets. + +Earlier CMS website versions may expect or rely on these styles. + +## Rules + +1. Folders __must__ include any top-of-file comments from source file. +1. Folders __must__ be [named with appropriate format](#Naming%20Format). +1. Files __should__ [comment on purpose and means of acquisition](#Documentation%20Format). +1. Files __must__ include any top-of-file comments from source file. +1. Files (except this document) __must__ be in a folder. + +## Documentation Format + +```css +/* +Pre-2020 Django CMS Bootstrap 3.3.7 +HOW: https://dev.help.com/some-tool +HOW: Included code that ... +HOW: Included code that ... (because ...) e.g.: + - ... +HOW: Did NOT incude code that ... +SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/bootstrap.min.css +*/ +``` + +## Naming Format + +| Format | Description | +| :- | :- | +| `A_B/` | from old "A" to new "B"[^1] +| `v1_v2/` | from Core__V1__ CMS (pre-2020) to Core__V2__ CMS (2020+) + +[^1]: Where "A" and "B" represent a version, or historical state, of the CMS. diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css deleted file mode 100644 index 2fabb13e3..000000000 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.cepv2.css +++ /dev/null @@ -1,4 +0,0 @@ -/* To overwrite problem code from `main.bootstrap.3.3.7.css` */ -html { - font-size: 16px; -} diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css deleted file mode 100644 index b0e705445..000000000 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/main.portal.css +++ /dev/null @@ -1,21 +0,0 @@ -/* -NOTE: Relevant styles for Pre-2020 `portal.scss` - - How: Manually find and retain code that is still used - - Source CSS: https://fronteraweb.tacc.utexas.edu/static/main.….css - - Source SCSS: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css -*/ - -/* … */ - -body { - font-family: 'Roboto', sans-serif; - /* min-height: 100%; */ - /* position: relative; */ -} - -/* … */ - -footer { - /* … */ - margin-top: 1em; -} diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/angular-material.1.1.8.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/angular-material.1.1.8.css similarity index 55% rename from taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/angular-material.1.1.8.css rename to taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/angular-material.1.1.8.css index d4a4ed12c..385daf393 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/angular-material.1.1.8.css +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/angular-material.1.1.8.css @@ -1,10 +1,10 @@ /* -NOTE: Relevant styles for Pre-2020 AngularJS Material Design - - How: https://developers.google.com/web/tools/chrome-devtools/coverage - - How: Include code that _is being_ used - - How: Include code that _could be_ used (because it is generic enough) - - `[tabindex="-1"]:focus` - - Source CSS: https://ajax.googleapis.com/ajax/libs/angular_material/1.1.8/angular-material.min.css +CoreV1 Portal AngularJS Material Design +HOW: https://developers.google.com/web/tools/chrome-devtools/coverage +HOW: Included code that _is being_ used +HOW: Included code that _could be_ used (because it is generic enough) e.g.: + - `[tabindex="-1"]:focus` +SRC: https://ajax.googleapis.com/ajax/libs/angular_material/1.1.8/angular-material.min.css */ /*! diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css similarity index 91% rename from taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.css rename to taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css index 5dd87a366..e200d9f66 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1-to-v2/bootstrap.3.3.7.css +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css @@ -1,13 +1,15 @@ /* -NOTE: Relevant styles for Pre-2020 Bootstrap 3.3.7 - - How: https://developers.google.com/web/tools/chrome-devtools/coverage - - How: Include code that _is being_ used - - How: Include code that _could be_ used (because it includes used selector) - - `__selector_start__` `__used_selector__` `__selector_end__` - - How: Did NOT incude code that is already in Bootstrap 4.0.0 - - How: Did NOT incude code that represents outdated web practices - - `outline: none` - - Source CSS: https://bitbucket.org/taccaci/frontera/src/master/client/css/bootstrap.min.css +CoreV1 Django CMS Bootstrap 3.3.7 +HOW: https://developers.google.com/web/tools/chrome-devtools/coverage +HOW: Included code that _is being_ used +HOW: Included code that _could be_ used (because it has used selector) e.g.: + - `used_selector …` + - `used_selector` + - `… used_selector` +HOW: Did NOT incude code that is already in Bootstrap 4.0.0 +HOW: Did NOT incude code that represents outdated web practices e.g.: + - `outline: none` +SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/bootstrap.min.css */ @import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css new file mode 100644 index 000000000..90718283a --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css @@ -0,0 +1,13 @@ +/* +Manual Override of Problem Code from Sibling Files +HOW: Manually find and retain code that is still used +SRC: https://fronteraweb.tacc.utexas.edu/static/main.___.css +SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css +*/ + +/* To overwrite `main.bootstrap.3.3.7.css` */ +html { + /* FAQ: CoreV2 CMS expects this */ + /* NOTE: CoreV2 CMS developer wbomar wants 10px (eases `rem` usage) */ + font-size: 100%; +} diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css new file mode 100644 index 000000000..d32286dfa --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css @@ -0,0 +1,21 @@ +/* +CoreV1 Portal Stylesheet `portal.css` +HOW: Manually find and retain code that is still used +SRC: https://fronteraweb.tacc.utexas.edu/static/main.___.css +SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css +*/ + +/* … */ + +body { + font-family: 'Roboto', sans-serif; + /* min-height: 100%; */ + /* position: relative; */ +} + +/* … */ + +footer { + /* … */ + margin-top: 1em; +} diff --git a/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css b/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css new file mode 100644 index 000000000..13f5ed24b --- /dev/null +++ b/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css @@ -0,0 +1,6 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +@import url("_migrations/v1_v2/bootstrap.3.3.7.css"); +@import url("_migrations/v1_v2/angular-material.1.1.8.css"); +@import url("_migrations/v1_v2/main.portal.css"); +@import url("_migrations/v1_v2/fixes.css"); From b5b1bb961ebce598f105afb2d8a0b8a58c8a3e06 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 4 Jun 2021 16:31:36 -0500 Subject: [PATCH 03/22] GH-245: Frontera to Use Standard Migration CSS --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 94b444dd8..323c7e83e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 94b444dd8281e7f41cb65faece5f1f8251e24592 +Subproject commit 323c7e83e0dbd0c83f8c95194f5cc9e033ec5cf2 From e4266225172b2998dab84c4aea38d56eb6e20334 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 4 Jun 2021 17:59:31 -0500 Subject: [PATCH 04/22] GH-245: Reduce Font Size Overrides by 2 Also, add comments about certain commented-out code. --- .../css/src/_migrations/v1_v2/bootstrap.3.3.7.css | 4 +++- .../site_cms/css/src/_migrations/v1_v2/fixes.css | 13 ------------- .../css/src/_migrations/v1_v2/main.portal.css | 3 +++ .../static/site_cms/css/src/migrate.v1_v2.css | 1 - 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css index e200d9f66..5f5bb5cfc 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css @@ -139,7 +139,9 @@ th { /* … */ html { - font-size:10px; + /* Disabled by TACC */ + /* FAQ: Let TACC handle influence `rem`; this and more may be deleted anyway */ + /* font-size:10px; */ -webkit-tap-highlight-color:rgba(0,0,0,0) } body { diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css deleted file mode 100644 index 90718283a..000000000 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/fixes.css +++ /dev/null @@ -1,13 +0,0 @@ -/* -Manual Override of Problem Code from Sibling Files -HOW: Manually find and retain code that is still used -SRC: https://fronteraweb.tacc.utexas.edu/static/main.___.css -SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css -*/ - -/* To overwrite `main.bootstrap.3.3.7.css` */ -html { - /* FAQ: CoreV2 CMS expects this */ - /* NOTE: CoreV2 CMS developer wbomar wants 10px (eases `rem` usage) */ - font-size: 100%; -} diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css index d32286dfa..fb1353fec 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css @@ -9,6 +9,9 @@ SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css body { font-family: 'Roboto', sans-serif; + + /* Disabled by TACC */ + /* FAQ: Wesley forgot why; this and more may be deleted anyway */ /* min-height: 100%; */ /* position: relative; */ } diff --git a/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css b/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css index 13f5ed24b..35e85edae 100644 --- a/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css +++ b/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css @@ -3,4 +3,3 @@ @import url("_migrations/v1_v2/bootstrap.3.3.7.css"); @import url("_migrations/v1_v2/angular-material.1.1.8.css"); @import url("_migrations/v1_v2/main.portal.css"); -@import url("_migrations/v1_v2/fixes.css"); From 8f374e80ac1b2806da0eba8b47efd718839286b7 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 4 Jun 2021 18:26:43 -0500 Subject: [PATCH 05/22] GH-245: Perma-comment for Portal CSS (required) --- taccsite_cms/static/site_cms/css/src/_migrations/README.md | 2 +- .../site_cms/css/src/_migrations/v1_v2/main.portal.css | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/README.md b/taccsite_cms/static/site_cms/css/src/_migrations/README.md index c0fdb63af..a25bee88c 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/README.md +++ b/taccsite_cms/static/site_cms/css/src/_migrations/README.md @@ -11,7 +11,7 @@ Earlier CMS website versions may expect or rely on these styles. 1. Folders __must__ include any top-of-file comments from source file. 1. Folders __must__ be [named with appropriate format](#Naming%20Format). 1. Files __should__ [comment on purpose and means of acquisition](#Documentation%20Format). -1. Files __must__ include any top-of-file comments from source file. +1. Files __must__ include a top-of-file comments (from source file or by TACC). 1. Files (except this document) __must__ be in a folder. ## Documentation Format diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css index fb1353fec..ff60520ae 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css +++ b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css @@ -1,10 +1,15 @@ /* CoreV1 Portal Stylesheet `portal.css` HOW: Manually find and retain code that is still used -SRC: https://fronteraweb.tacc.utexas.edu/static/main.___.css SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css */ +/*! + * CoreV1 Portal Stylesheet `portal.css` + * https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css + * 59e345f + */ + /* … */ body { From dcf018f7cd6ed9956bf2cf0c7b009c15a960bf90 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 17 Jun 2021 16:12:46 -0500 Subject: [PATCH 06/22] GH-245: Update submodule to merge of main --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 323c7e83e..ec660de36 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 323c7e83e0dbd0c83f8c95194f5cc9e033ec5cf2 +Subproject commit ec660de368ff6fec17cdeee84611753d0dcb0313 From 41b521dd03ba36d1bb397378ec5c63a44fb82394 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 1 Jul 2021 16:25:45 -0500 Subject: [PATCH 07/22] GH-245: 3Dem: Load migration stylesheet --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 4b353b748..43fc53a70 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 4b353b7487efe14e3b94865e77182f9d0cfeab50 +Subproject commit 43fc53a70b665c7c4f1ec3a8b651080342783672 From 381db73dbca43c6a78d486893a5a7ba598130338 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 6 Jul 2021 15:51:48 -0500 Subject: [PATCH 08/22] GH-245: Noop: Readme tweak (to trigger new build) --- taccsite_cms/static/site_cms/css/src/_migrations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/README.md b/taccsite_cms/static/site_cms/css/src/_migrations/README.md index a25bee88c..0065ef241 100644 --- a/taccsite_cms/static/site_cms/css/src/_migrations/README.md +++ b/taccsite_cms/static/site_cms/css/src/_migrations/README.md @@ -4,7 +4,7 @@ ORGANIZE STYLES HERE! These folders' styles are only to be imported by other stylesheets. -Earlier CMS website versions may expect or rely on these styles. +CMS websites that were migrated from earlier instances may need these styles. ## Rules From 4b14872a2da5b131e60bb1f5a2812bf472f816d0 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 9 Jul 2021 13:20:57 -0500 Subject: [PATCH 09/22] GH-245: Update submod --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 43fc53a70..d1a184502 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 43fc53a70b665c7c4f1ec3a8b651080342783672 +Subproject commit d1a18450233752bfe0360b2632c108ab5f91f34a From abc1456c5aa3575f78f064ed67a4758451f0bf5d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 9 Jul 2021 14:21:03 -0500 Subject: [PATCH 10/22] GH-245/GH-56: Move migration styles to submodule --- README.md | 17 +- .../static/site_cms/css/src/README.md | 3 - .../site_cms/css/src/_migrations/README.md | 38 -- .../v1_v2/angular-material.1.1.8.css | 42 -- .../src/_migrations/v1_v2/bootstrap.3.3.7.css | 439 ------------------ .../css/src/_migrations/v1_v2/main.portal.css | 29 -- .../static/site_cms/css/src/migrate.v1_v2.css | 5 - taccsite_custom | 2 +- 8 files changed, 15 insertions(+), 560 deletions(-) delete mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/README.md delete mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/angular-material.1.1.8.css delete mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css delete mode 100644 taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css delete mode 100644 taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css diff --git a/README.md b/README.md index 4ae1bf037..114e8d606 100644 --- a/README.md +++ b/README.md @@ -97,11 +97,22 @@ To support multiple instances of the CMS on one machine (i.e. local development) Some websites need static resources to supplement their migration. -1. Copy `taccsite_cms/templates/fullwidth.html` to `taccsite_custom/name-of-project/templates/fullwidth.html`. -2. Update `taccsite_custom/name-of-project/templates/fullwidth.html` to load migration static resources e.g., in `assets_custom` block add: +1. __If__ you did not [create your project by cloning `example-cms`](#custom-resources), __then__: + 1. Copy `templates/fullwidth.html` from `taccsite_custom/example-cms/` to `taccsite_custom/name-of-project/`. + 2. Copy `static/.../css/src/migrate.v1_v2.css` from `taccsite_custom/example-cms/` to `taccsite_custom/name-of-project/`. +2. Update `taccsite_custom/name-of-project/templates/fullwidth.html` to load migration assets e.g.: + - Change ```html - + + + ``` + + - To + + ```html + + ``` ## Run the CMS diff --git a/taccsite_cms/static/site_cms/css/src/README.md b/taccsite_cms/static/site_cms/css/src/README.md index da85c01d4..abb4a9601 100644 --- a/taccsite_cms/static/site_cms/css/src/README.md +++ b/taccsite_cms/static/site_cms/css/src/README.md @@ -23,9 +23,6 @@ _This directory exists in `static/` __only__ because it is customary, using Djan | `site(.*).css` | styles that apply to the entire website i.e. global styles | `template.*.css` | styles that apply only to certain templates | `page.*.css` | styles that apply only to certain pages -| `migrate.*.css` | styles that apply to websites that have been migrated[^1] - -[^1]: When sensible, use the migration folder name, i.e. `migrate.v1_v2.css`. ## Documentation Format diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/README.md b/taccsite_cms/static/site_cms/css/src/_migrations/README.md deleted file mode 100644 index 0065ef241..000000000 --- a/taccsite_cms/static/site_cms/css/src/_migrations/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# TACC CMS - Stylesheets - Migrations - -ORGANIZE STYLES HERE! - -These folders' styles are only to be imported by other stylesheets. - -CMS websites that were migrated from earlier instances may need these styles. - -## Rules - -1. Folders __must__ include any top-of-file comments from source file. -1. Folders __must__ be [named with appropriate format](#Naming%20Format). -1. Files __should__ [comment on purpose and means of acquisition](#Documentation%20Format). -1. Files __must__ include a top-of-file comments (from source file or by TACC). -1. Files (except this document) __must__ be in a folder. - -## Documentation Format - -```css -/* -Pre-2020 Django CMS Bootstrap 3.3.7 -HOW: https://dev.help.com/some-tool -HOW: Included code that ... -HOW: Included code that ... (because ...) e.g.: - - ... -HOW: Did NOT incude code that ... -SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/bootstrap.min.css -*/ -``` - -## Naming Format - -| Format | Description | -| :- | :- | -| `A_B/` | from old "A" to new "B"[^1] -| `v1_v2/` | from Core__V1__ CMS (pre-2020) to Core__V2__ CMS (2020+) - -[^1]: Where "A" and "B" represent a version, or historical state, of the CMS. diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/angular-material.1.1.8.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/angular-material.1.1.8.css deleted file mode 100644 index 385daf393..000000000 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/angular-material.1.1.8.css +++ /dev/null @@ -1,42 +0,0 @@ -/* -CoreV1 Portal AngularJS Material Design -HOW: https://developers.google.com/web/tools/chrome-devtools/coverage -HOW: Included code that _is being_ used -HOW: Included code that _could be_ used (because it is generic enough) e.g.: - - `[tabindex="-1"]:focus` -SRC: https://ajax.googleapis.com/ajax/libs/angular_material/1.1.8/angular-material.min.css -*/ - -/*! - * AngularJS Material Design - * https://github.com/angular/material - * @license MIT - * v1.1.8 - */ -body, -html { - height: 100%; - position: relative; -} -body { - margin: 0; - padding: 0; -} -[tabindex="-1"]:focus { - outline: none; -} - -/* … */ - -body, -html { - -webkit-tap-highlight-color:transparent; - -webkit-touch-callout:none; - min-height:100%; - -webkit-text-size-adjust:100%; - -ms-text-size-adjust:100%; - -webkit-font-smoothing:antialiased; - -moz-osx-font-smoothing:grayscale -} - -/* … */ diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css deleted file mode 100644 index 5f5bb5cfc..000000000 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/bootstrap.3.3.7.css +++ /dev/null @@ -1,439 +0,0 @@ -/* -CoreV1 Django CMS Bootstrap 3.3.7 -HOW: https://developers.google.com/web/tools/chrome-devtools/coverage -HOW: Included code that _is being_ used -HOW: Included code that _could be_ used (because it has used selector) e.g.: - - `used_selector …` - - `used_selector` - - `… used_selector` -HOW: Did NOT incude code that is already in Bootstrap 4.0.0 -HOW: Did NOT incude code that represents outdated web practices e.g.: - - `outline: none` -SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/bootstrap.min.css -*/ - -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); -/*! - * bootswatch v3.3.7 - * Homepage: http://bootswatch.com - * Copyright 2012-2017 Thomas Park - * Licensed under MIT - * Based on Bootstrap -*//*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ - -/* … */ - -b, -strong { - font-weight:bold -} - -/* … */ - -h1 { - font-size:2em; - margin:0.67em 0 -} - -/* … */ - -img { - border:0 -} - -/* … */ - -hr { - -webkit-box-sizing:content-box; - -moz-box-sizing:content-box; - box-sizing:content-box; - height:0 -} - -/* … */ - -button, -input, -optgroup, -select, -textarea { - color:inherit; - font:inherit; - margin:0 -} -button { - overflow:visible -} -button, -select { - text-transform:none -} -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - -webkit-appearance:button; - cursor:pointer -} -button[disabled], -html input[disabled] { - cursor:default -} -button::-moz-focus-inner, -input::-moz-focus-inner { - border:0; - padding:0 -} -input { - line-height:normal -} -input[type="checkbox"], -input[type="radio"] { - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - box-sizing:border-box; - padding:0 -} -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height:auto -} -input[type="search"] { - -webkit-appearance:textfield; - -webkit-box-sizing:content-box; - -moz-box-sizing:content-box; - box-sizing:content-box -} -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance:none -} -fieldset { - border:1px solid #c0c0c0; - margin:0 2px; - padding:0.35em 0.625em 0.75em -} -legend { - border:0; - padding:0 -} -textarea { - overflow:auto -} -optgroup { - font-weight:bold -} -table { - border-collapse:collapse; - border-spacing:0 -} -td, -th { - padding:0 -} - -/* … */ - -html { - /* Disabled by TACC */ - /* FAQ: Let TACC handle influence `rem`; this and more may be deleted anyway */ - /* font-size:10px; */ - -webkit-tap-highlight-color:rgba(0,0,0,0) -} -body { - font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; - font-size:15px; - line-height:1.4; - color:#222222; -} - -/* … */ - -a { - color:#008cba; - /* text-decoration:none */ -} -a:hover, -a:focus { - color:#008cba; - /* text-decoration:underline */ -} -a:focus { - outline:5px auto -webkit-focus-ring-color; - outline-offset:-2px -} - -/* … */ - -.img-responsive, -.thumbnail>img, -.thumbnail a>img, -.carousel-inner>.item>img, -.carousel-inner>.item>a>img { - display:block; - max-width:100%; - height:auto -} - -/* … */ - -hr { - margin-top:21px; - margin-bottom:21px; - border:0; - border-top:1px solid #dddddd -} - -/* … */ - -h1, -h2, -h3, -h4, -h5, -h6, -.h1, -.h2, -.h3, -.h4, -.h5, -.h6 { - font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif; - font-weight:300; - line-height:1.1; - /* color:inherit */ -} - -/* … */ - -h1, -.h1, -h2, -.h2, -h3, -.h3 { - margin-top:21px; - margin-bottom:10.5px -} - -/* … */ - -h4, -.h4, -h5, -.h5, -h6, -.h6 { - margin-top:10.5px; - margin-bottom:10.5px -} - -/* … */ - -h1, -.h1 { - font-size:39px -} -h2, -.h2 { - font-size:32px -} -h3, -.h3 { - font-size:26px -} -h4, -.h4 { - font-size:19px -} -h5, -.h5 { - font-size:15px -} -h6, -.h6 { - font-size:13px -} -p { - margin:0 0 10.5px -} - -/* … */ - -.btn { - display:inline-block; - margin-bottom:0; - font-weight:normal; - text-align:center; - vertical-align:middle; - -ms-touch-action:manipulation; - touch-action:manipulation; - cursor:pointer; - background-image:none; - border:1px solid transparent; - white-space:nowrap; - padding:8px 12px; - font-size:15px; - line-height:1.4; - border-radius:0; - -webkit-user-select:none; - -moz-user-select:none; - -ms-user-select:none; - user-select:none -} -.btn:focus, -.btn:active:focus, -.btn.active:focus, -.btn.focus, -.btn:active.focus, -.btn.active.focus { - outline:5px auto -webkit-focus-ring-color; - outline-offset:-2px -} -.btn:hover, -.btn:focus, -.btn.focus { - color:#333333; - text-decoration:none -} -.btn:active, -.btn.active { - outline:0; - background-image:none; - -webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125); - box-shadow:inset 0 3px 5px rgba(0,0,0,0.125) -} -.btn.disabled, -.btn[disabled], -fieldset[disabled] .btn { - cursor:not-allowed; - opacity:0.65; - filter:alpha(opacity=65); - -webkit-box-shadow:none; - box-shadow:none -} -a.btn.disabled, -fieldset[disabled] a.btn { - pointer-events:none -} - -/* … */ - -.btn-primary { - color:#ffffff; - background-color:#008cba; - border-color:#0079a1 -} -.btn-primary:focus, -.btn-primary.focus { - color:#ffffff; - background-color:#006687; - border-color:#001921 -} -.btn-primary:hover { - color:#ffffff; - background-color:#006687; - border-color:#004b63 -} -.btn-primary:active, -.btn-primary.active, -.open>.dropdown-toggle.btn-primary { - color:#ffffff; - background-color:#006687; - border-color:#004b63 -} -.btn-primary:active:hover, -.btn-primary.active:hover, -.open>.dropdown-toggle.btn-primary:hover, -.btn-primary:active:focus, -.btn-primary.active:focus, -.open>.dropdown-toggle.btn-primary:focus, -.btn-primary:active.focus, -.btn-primary.active.focus, -.open>.dropdown-toggle.btn-primary.focus { - color:#ffffff; - background-color:#004b63; - border-color:#001921 -} -.btn-primary:active, -.btn-primary.active, -.open>.dropdown-toggle.btn-primary { - background-image:none -} -.btn-primary.disabled:hover, -.btn-primary[disabled]:hover, -fieldset[disabled] .btn-primary:hover, -.btn-primary.disabled:focus, -.btn-primary[disabled]:focus, -fieldset[disabled] .btn-primary:focus, -.btn-primary.disabled.focus, -.btn-primary[disabled].focus, -fieldset[disabled] .btn-primary.focus { - background-color:#008cba; - border-color:#0079a1 -} -.btn-primary .badge { - color:#008cba; - background-color:#ffffff -} - -/* … */ - -.btn-block { - display:block; - width:100% -} -.btn-block+.btn-block { - margin-top:5px -} -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width:100% -} - -/* … */ - -.label { - display:inline; - padding:.2em .6em .3em; - font-size:75%; - font-weight:bold; - line-height:1; - color:#ffffff; - text-align:center; - white-space:nowrap; - vertical-align:baseline; - border-radius:.25em -} - -/* … */ - -.label:empty { - display:none -} - -/* … */ - -.label-success { - background-color:#43ac6a -} -.label-success[href]:hover, -.label-success[href]:focus { - background-color:#358753 -} - -/* … */ - -.label { - padding-left:1em; - padding-right:1em; - border-radius:0; - font-weight:300 -} - -/* … */ diff --git a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css b/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css deleted file mode 100644 index ff60520ae..000000000 --- a/taccsite_cms/static/site_cms/css/src/_migrations/v1_v2/main.portal.css +++ /dev/null @@ -1,29 +0,0 @@ -/* -CoreV1 Portal Stylesheet `portal.css` -HOW: Manually find and retain code that is still used -SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css -*/ - -/*! - * CoreV1 Portal Stylesheet `portal.css` - * https://bitbucket.org/taccaci/frontera/src/master/client/css/portal.css - * 59e345f - */ - -/* … */ - -body { - font-family: 'Roboto', sans-serif; - - /* Disabled by TACC */ - /* FAQ: Wesley forgot why; this and more may be deleted anyway */ - /* min-height: 100%; */ - /* position: relative; */ -} - -/* … */ - -footer { - /* … */ - margin-top: 1em; -} diff --git a/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css b/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css deleted file mode 100644 index 35e85edae..000000000 --- a/taccsite_cms/static/site_cms/css/src/migrate.v1_v2.css +++ /dev/null @@ -1,5 +0,0 @@ -/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ - -@import url("_migrations/v1_v2/bootstrap.3.3.7.css"); -@import url("_migrations/v1_v2/angular-material.1.1.8.css"); -@import url("_migrations/v1_v2/main.portal.css"); diff --git a/taccsite_custom b/taccsite_custom index d1a184502..b14e0ee24 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit d1a18450233752bfe0360b2632c108ab5f91f34a +Subproject commit b14e0ee243be870d9558739e8a3c77440e043cc4 From e8d864e3c16d1820855f0450fe0c77071d6fcc37 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 9 Jul 2021 16:02:01 -0500 Subject: [PATCH 11/22] GH-245/GH-56: Try to avoid server crash Avoid this error that occurred on A2CPS ``` AttributeError: module 'taccsite_custom._shared' has no attribute 'default_app_config' ``` via Core-Portal-Deployments 91966f8. --- taccsite_cms/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 530c2d3fd..2ffe5734f 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -247,7 +247,7 @@ def getsecrets(): def get_subdirs_as_module_names(path): module_names = [] for entry in os.scandir(path): - if entry.is_dir(): + if entry.is_dir() and not entry.path.startswith('_'): # FAQ: There are different root paths to tweak: # - Containers use `/code/…` # - Python Venvs use `/srv/taccsite/…` From 9502d7e9bde276aeeb21144a2b82da355b15203b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 9 Jul 2021 16:15:40 -0500 Subject: [PATCH 12/22] GH-245/GH-56: Try to avoid server crash (new way) --- taccsite_cms/settings.py | 2 +- taccsite_custom | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 2ffe5734f..530c2d3fd 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -247,7 +247,7 @@ def getsecrets(): def get_subdirs_as_module_names(path): module_names = [] for entry in os.scandir(path): - if entry.is_dir() and not entry.path.startswith('_'): + if entry.is_dir(): # FAQ: There are different root paths to tweak: # - Containers use `/code/…` # - Python Venvs use `/srv/taccsite/…` diff --git a/taccsite_custom b/taccsite_custom index b14e0ee24..a9c15b19e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit b14e0ee243be870d9558739e8a3c77440e043cc4 +Subproject commit a9c15b19ede7070de22b0757b3e562b53a0754a4 From 9b0a0ef3a717ab32ad790ddf1a60a093641ed55b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 9 Jul 2021 17:03:43 -0500 Subject: [PATCH 13/22] GH-245/GH-56: Submod: Add small doc --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index a9c15b19e..8c485eb5e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit a9c15b19ede7070de22b0757b3e562b53a0754a4 +Subproject commit 8c485eb5ed0fd87f22212c5a3b78d93ef1d98d49 From 70278589f3499c8568b1e5fbf50ccd97c086257b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 12 Jul 2021 10:33:43 -0500 Subject: [PATCH 14/22] GH-245/GH-56: Submod: Revert GH-73 commits --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 8c485eb5e..cd5d6b0bf 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 8c485eb5ed0fd87f22212c5a3b78d93ef1d98d49 +Subproject commit cd5d6b0bfb5f1dc541c0393640ca599bce893890 From 09fc577bc82838f62334a5887f3b2c9f42f63185 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 12 Jul 2021 18:07:40 -0500 Subject: [PATCH 15/22] Quick: Submod: Merge main --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index cd5d6b0bf..f2f219d97 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit cd5d6b0bfb5f1dc541c0393640ca599bce893890 +Subproject commit f2f219d9759682731ada6d5f9357892f1be953cd From 2c339563a5979ace84d7421f5fd07943d6281bc3 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Jul 2021 16:49:37 -0500 Subject: [PATCH 16/22] GH-245: Add A2CPS v1 Styles --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index f2f219d97..721a63cf3 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit f2f219d9759682731ada6d5f9357892f1be953cd +Subproject commit 721a63cf33638c4a1e429d0e863eb3c9b51a40f9 From d2398feb9f3fb63c3e14e87d4c962ba8eed416e5 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Jul 2021 18:31:17 -0500 Subject: [PATCH 17/22] GH-245: A2CPS: Add table styles --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 721a63cf3..6928bc4f3 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 721a63cf33638c4a1e429d0e863eb3c9b51a40f9 +Subproject commit 6928bc4f3be5672487560e38832bd32f2b9abf2d From 819c7e73c50a756b238898b6d988ac2da9a2d458 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Jul 2021 18:32:10 -0500 Subject: [PATCH 18/22] =?UTF-8?q?GH-245:=20A2CPS:=20Add=20table=20styles?= =?UTF-8?q?=20=E2=80=94=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 6928bc4f3..ccaecb45e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 6928bc4f3be5672487560e38832bd32f2b9abf2d +Subproject commit ccaecb45e7fc269f0434a6097c29ee8113e750ca From 3e345a82d97f18516c0751a3c95096700e800366 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Jul 2021 18:53:13 -0500 Subject: [PATCH 19/22] GH-245: A2CPS: Finish table styles --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index ccaecb45e..92412531e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit ccaecb45e7fc269f0434a6097c29ee8113e750ca +Subproject commit 92412531ecef2b1b6f91a9e80320e41b5e9a539d From 55ecd5850f4b357968138b44ebf3c81f74007f7b Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Jul 2021 19:31:22 -0500 Subject: [PATCH 20/22] GH-245: A2CPS: Distinguish different cards --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 92412531e..e318e731e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 92412531ecef2b1b6f91a9e80320e41b5e9a539d +Subproject commit e318e731ed9bdb0fc68cdb3c92ff50f3713df745 From 5dd8c635a3036715ca0a6c0c00b9d96279f0997f Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 20 Jul 2021 19:57:10 -0500 Subject: [PATCH 21/22] GH-245: A2CPS: Fix CSS import error --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 516361a19..347aa0c7e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 516361a19f3640a25434d4f0a73d61d48d33d8de +Subproject commit 347aa0c7e249646dc1e7379c1dde4de9b1694164 From aa4a173ce39c49053ef5e9a72a77c8e493c4b9b7 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 12 Aug 2021 19:25:30 -0500 Subject: [PATCH 22/22] GH-245: Update submod (merge main) --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index bdcaa500f..af8c7cc4c 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit bdcaa500fee3424462725e5e64fe4136510eba64 +Subproject commit af8c7cc4cd5d2512104858742226680943f88e9d