"> From faa5f85552c9c78e3117a314fc73073a09046ba1 Mon Sep 17 00:00:00 2001 From: qtamu Date: Wed, 3 Jul 2024 12:24:48 -0500 Subject: [PATCH 06/32] Tamu styling --- app/views/layouts/avalon.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/layouts/avalon.html.erb b/app/views/layouts/avalon.html.erb index 3cf55d248d..78cbf08bdb 100644 --- a/app/views/layouts/avalon.html.erb +++ b/app/views/layouts/avalon.html.erb @@ -30,7 +30,6 @@ Unless required by applicable law or agreed to in writing, software distributed <%= favicon_link_tag %> <%= stylesheet_link_tag "application", media: "all", 'data-turbolinks-track': 'reload' %> - <%= stylesheet_link_tag "tamu", media: "all", 'data-turbolinks-track': 'reload' %> <%= stylesheet_pack_tag 'application' %> <%= javascript_pack_tag 'application' %> <%= yield :page_styles %> From 511fd8114ff6d4cb974ff78f7db953fc39b11c70 Mon Sep 17 00:00:00 2001 From: qtamu Date: Fri, 5 Jul 2024 11:15:25 -0500 Subject: [PATCH 07/32] Tamu styling --- app/assets/stylesheets/tamu.scss | 2 +- app/views/layouts/avalon.html.erb | 2 +- app/views/modules/_header.html.erb | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/tamu.scss b/app/assets/stylesheets/tamu.scss index e310a68ec1..ac5e7ebbcc 100644 --- a/app/assets/stylesheets/tamu.scss +++ b/app/assets/stylesheets/tamu.scss @@ -1,6 +1,6 @@ #header-navbar .navbar-brand { background: transparent "tamu-logo-with-bar.png" no-repeat top left; - /* background: transparent url(/assets/tamu/tamu-logo-with-bar.png) no-repeat top left; */ + // background: transparent url(/assets/tamu/tamu-logo-with-bar.png) no-repeat top left; margin-top: 10px; margin-bottom: -10px; } diff --git a/app/views/layouts/avalon.html.erb b/app/views/layouts/avalon.html.erb index 78cbf08bdb..52d6e281c4 100644 --- a/app/views/layouts/avalon.html.erb +++ b/app/views/layouts/avalon.html.erb @@ -24,7 +24,7 @@ Unless required by applicable law or agreed to in writing, software distributed - + <%= csrf_meta_tags %> diff --git a/app/views/modules/_header.html.erb b/app/views/modules/_header.html.erb index ae0e63e350..a29ac54342 100644 --- a/app/views/modules/_header.html.erb +++ b/app/views/modules/_header.html.erb @@ -13,14 +13,27 @@ Unless required by applicable law or agreed to in writing, software distributed specific language governing permissions and limitations under the License. --- END LICENSE_HEADER BLOCK --- %> +
-
+
+ +
+
+ +
+
+
-
+
\ No newline at end of file From 8bd151b91cf56fe1e9dd6fd2280a239544a994d7 Mon Sep 17 00:00:00 2001 From: qtamu Date: Fri, 5 Jul 2024 11:47:46 -0500 Subject: [PATCH 08/32] Tamu styling --- app/views/layouts/avalon.html.erb | 2 +- app/views/modules/_user_management.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/avalon.html.erb b/app/views/layouts/avalon.html.erb index 52d6e281c4..78cbf08bdb 100644 --- a/app/views/layouts/avalon.html.erb +++ b/app/views/layouts/avalon.html.erb @@ -24,7 +24,7 @@ Unless required by applicable law or agreed to in writing, software distributed - + <%= csrf_meta_tags %> diff --git a/app/views/modules/_user_management.html.erb b/app/views/modules/_user_management.html.erb index cdbc68ca14..1160300ebe 100644 --- a/app/views/modules/_user_management.html.erb +++ b/app/views/modules/_user_management.html.erb @@ -21,5 +21,5 @@ Unless required by applicable law or agreed to in writing, software distributed <% end %> | <%= link_to t('auth.sign_out'), main_app.destroy_user_session_path %> <% else %> - <%= link_to t('auth.sign_in'), main_app.new_user_session_path, :class => "btn btn-info" %> + <%= link_to t('auth.sign_in'), main_app.new_user_session_path, :class => "tamu-btn tamu-btn-info" %> <% end %> From 902a1db7d2106d475540f1b619769acb347072bb Mon Sep 17 00:00:00 2001 From: qtamu Date: Fri, 5 Jul 2024 12:53:31 -0500 Subject: [PATCH 09/32] Tamu styling --- app/assets/stylesheets/tamu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/tamu.scss b/app/assets/stylesheets/tamu.scss index ac5e7ebbcc..190f67025d 100644 --- a/app/assets/stylesheets/tamu.scss +++ b/app/assets/stylesheets/tamu.scss @@ -15,7 +15,7 @@ .custom-header { background-color: #3c0000; - padding: 0px 0px 0px 0px; + padding: 0px 0px 20px 0px; } .navbar-default { From d173d6bfd9e0ce7c55aeef3e650307dc7352c269 Mon Sep 17 00:00:00 2001 From: qtamu Date: Fri, 5 Jul 2024 13:11:45 -0500 Subject: [PATCH 10/32] Tamu styling --- app/assets/stylesheets/branding.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/branding.scss b/app/assets/stylesheets/branding.scss index 50615f9747..f5346d2e92 100644 --- a/app/assets/stylesheets/branding.scss +++ b/app/assets/stylesheets/branding.scss @@ -30,7 +30,8 @@ $sansFontFamily: Arial, Helvetica, sans-serif; $museoSlab: 'MuseoSlab'; // Primary colors -$primary: #2a5459; +// $primary: #2a5459; +$primary: #500000; $secondary: #80a590; $dark: #0a2326; From cde43a2b9e5c0283218d0f45ddb67f03cef17bb1 Mon Sep 17 00:00:00 2001 From: qtamu Date: Fri, 5 Jul 2024 13:23:52 -0500 Subject: [PATCH 11/32] tamu styling --- app/assets/stylesheets/tamu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/tamu.scss b/app/assets/stylesheets/tamu.scss index 190f67025d..a2c2118329 100644 --- a/app/assets/stylesheets/tamu.scss +++ b/app/assets/stylesheets/tamu.scss @@ -15,7 +15,7 @@ .custom-header { background-color: #3c0000; - padding: 0px 0px 20px 0px; + padding: 10px 0px 10px 0px; } .navbar-default { From 4df1c65396886e49ead39517dd0a541bfe56bd5e Mon Sep 17 00:00:00 2001 From: qtamu Date: Fri, 5 Jul 2024 14:07:37 -0500 Subject: [PATCH 12/32] decrease margin bottom in global nav --- app/views/modules/_global_navigation.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/modules/_global_navigation.html.erb b/app/views/modules/_global_navigation.html.erb index 51cdff5abf..b162fc5bb7 100644 --- a/app/views/modules/_global_navigation.html.erb +++ b/app/views/modules/_global_navigation.html.erb @@ -13,7 +13,7 @@ Unless required by applicable law or agreed to in writing, software distributed specific language governing permissions and limitations under the License. --- END LICENSE_HEADER BLOCK --- %> -