Skip to content

Commit

Permalink
Merge pull request #882 from sul-dlss/remove-unnecessary-code
Browse files Browse the repository at this point in the history
Remove unnecessary code
  • Loading branch information
jcoyne authored Dec 7, 2023
2 parents be53e6a + 685f67a commit 8337b2e
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 312 deletions.
5 changes: 0 additions & 5 deletions app/assets/stylesheets/application.sass.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import 'deja-vu-font';
@import 'sul-variables';
@import 'searchworks-mixins';

@import 'bootstrap-variables';
@import 'bootstrap/scss/bootstrap';
Expand All @@ -17,14 +16,10 @@
@import 'modules/record-view';
@import 'modules/record-metadata-section';
@import 'modules/search-bar';
@import 'modules/skip-to-nav';
@import 'modules/sul-footer';
@import 'modules/sul-icons';
@import 'modules/sul-toolbar';
@import 'modules/top-navbar';

@import 'print/styles';

.record-metadata {
margin-bottom: 2em;
}
25 changes: 1 addition & 24 deletions app/assets/stylesheets/base.scss
Original file line number Diff line number Diff line change
@@ -1,36 +1,13 @@
a {
&.disabled {
color: #ccc;
cursor: not-allowed;
text-decoration: none;
}
}

.su-underline {
text-decoration: none;
border-bottom: 1px dotted $sul-link-color-border;
}

h1 {
font-family: 'dejavu_sansextralight';
letter-spacing: -0.05em;
}

h3 {
font-weight: 400;
line-height: 1.3em;
margin: 0 0 .4em 0;
}

dl {
margin-bottom: 15px;
}

label {
font-weight: normal;
}

.section {
p, li {
max-width: 45em;
}
}
4 changes: 0 additions & 4 deletions app/assets/stylesheets/bootstrap-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ $navbar-default-link-hover-color: $white;
$navbar-default-link-active-color: $white;
$navbar-default-toggle-hover-bg: transparent;

// Pagination
$pagination-active-bg: $sul-pagination-active-bg;
$pagination-active-border: $sul-pagination-active-bg;

// Tables
$table-bg-accent: $color-beige-10;
$table-border-color: #b6b1A9;
Expand Down
16 changes: 4 additions & 12 deletions app/assets/stylesheets/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
border: none;
}

#topnav, #search-navbar, #main-container, #sul-footer, #masthead-container {
#topnav, #search-navbar, #main-container, #sul-footer {
margin: 0 auto;
text-align: left;
}
Expand All @@ -31,19 +31,19 @@ a#sul-logo {
}

@media (min-width: 768px) {
#topnav, #search-navbar, #main-container, #sul-footer, #masthead-container {
#topnav, #search-navbar, #main-container, #sul-footer {
width: 750px;
}
}

@media (min-width: 980px) {
#topnav, #search-navbar, #main-container, #sul-footer, #masthead-container {
#topnav, #search-navbar, #main-container, #sul-footer {
width: 970px;
}
}

@media (min-width: 1200px) {
#topnav, #search-navbar, #main-container, #sul-footer, #masthead-container {
#topnav, #search-navbar, #main-container, #sul-footer {
width: 1170px;
}
}
Expand All @@ -53,12 +53,4 @@ a#sul-logo {
#main-container, #search-navbar {
padding: 0 15px;
}

#search-navbar-container .search-form {
padding: 0;
}

#search-navbar .navbar-toggle {
margin-right: 0;
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/modules/feedback-form.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#feedback-form {
border-bottom: 3px solid $sul-toolbar-border;
border-bottom: 3px solid $color-beige-40;
}

.feedback-alert {
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/modules/search-bar.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#search-navbar-container {
padding: 0;
background-color: $color-cardinal-red;
box-shadow: 0 4px 8px -2px rgba(0, 0, 0, 0.2)
}
33 changes: 0 additions & 33 deletions app/assets/stylesheets/modules/skip-to-nav.scss

This file was deleted.

5 changes: 0 additions & 5 deletions app/assets/stylesheets/modules/sul-toolbar.scss

This file was deleted.

93 changes: 0 additions & 93 deletions app/assets/stylesheets/print/styles.scss

This file was deleted.

4 changes: 0 additions & 4 deletions app/assets/stylesheets/searchworks-mixins.scss

This file was deleted.

73 changes: 0 additions & 73 deletions app/assets/stylesheets/sul-styles/sul_footer.scss

This file was deleted.

20 changes: 0 additions & 20 deletions app/assets/stylesheets/sul-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,16 @@ $color-black: #000;
$white: #ffffff;
$color-cardinal-red: #8c1515;
$color-blackish: #2e2d29;
$gray-41-percent: #696969;
$color-gray-60: #8a887d;
$color-pantone-401: #b6b1a9;
$color-beige-40: #d5d0c0;
$color-beige-30: #e3dfd5;
$color-beige-20: #e9e6df;
$color-beige-10: #f2f1eb;
$color-beige-05: #fbfbf9;

$sul-footer-bg-color: $color-beige-10;
$sul-footer-border-top-color: $color-beige-20;
$footer-height: 200px;
$sul-footer-shadow-color: rgba(0, 0, 0, 0.2);
$sul-footer-shadow: 0 4px 8px -8px $sul-footer-shadow-color inset;

$sul-footer-bg-color: $color-beige-10;
$sul-topnavbar-link-color: $color-cardinal-red;
$sul-link-color: #006CB8;
$sul-link-color-border: $color-pantone-401;
$sul-pagination-active-bg: $gray-41-percent;
$sul-body-bg: $color-beige-05;
$sul-text-color: $color-black;
$sul-h2-border-color: $color-beige-30;
$sul-skip-to-nav-bg: $color-beige-10;
$sul-toolbar-bg: transparent;
$sul-toolbar-border: $color-beige-40;
$btn-sul-toolbar-bar-color: $color-cardinal-red;
$btn-sul-toolbar-bar-hover-bg: $color-beige-30;
$sul-shadow-color: rgba(0, 0, 0, .2);

// Sizes
$gallery-document-width: 176px;
$gallery-document-height: 400px;
2 changes: 0 additions & 2 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
<%= content_for(:head) %>
</head>
<body>
<%= render 'shared/skip_to_nav' %>

<div id="su-wrap"> <!-- #su-wrap start -->
<div id="su-content"> <!-- #su-content start -->
<div id="outer-container" class="container-fluid">
Expand Down
Loading

0 comments on commit 8337b2e

Please sign in to comment.