Skip to content

Commit

Permalink
Fixed styles
Browse files Browse the repository at this point in the history
  • Loading branch information
Deepika Gonuguntla committed Aug 16, 2021
1 parent e891c94 commit a8fe25f
Show file tree
Hide file tree
Showing 12 changed files with 616 additions and 228 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ gem 'rexml', '~> 3.2'
gem 'thread_safe', '~> 0.3.6'
gem "react_on_rails", "12.0.0"
gem "webpacker", "~> 5"
gem "breakpoint", "~>2.4.0"

group :assets do # Gems used only for assets and not required in production environments by default.
gem 'sass-rails'
Expand Down
9 changes: 8 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1141,6 +1141,9 @@ GEM
bcrypt (3.1.16)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
breakpoint (2.4.6)
sass (~> 3.3.0)
sassy-maps (< 1.0.0)
builder (3.2.4)
cabin (0.9.0)
character_set (1.4.1)
Expand Down Expand Up @@ -1299,7 +1302,7 @@ GEM
kaminari-core (1.2.1)
launchy (2.5.0)
addressable (~> 2.7)
libv8-node (15.14.0.0-x86_64-darwin-18)
libv8-node (15.14.0.0)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
Expand Down Expand Up @@ -1444,6 +1447,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4)
sass (3.3.14)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
Expand All @@ -1454,6 +1458,8 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
sassy-maps (0.4.0)
sass (~> 3.3)
semantic_range (3.0.0)
set (1.0.1)
signet (0.14.1)
Expand Down Expand Up @@ -1541,6 +1547,7 @@ DEPENDENCIES
addressable
auto-session-timeout
aws-sdk (~> 3)
breakpoint (~> 2.4.0)
client_side_validations (= 17.2.0)
coffee-rails
cranky
Expand Down
Binary file added app/assets/images/hero_campaign_bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/hero_campaign_left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 31 additions & 7 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@
*= require ./vendor/jquery.swipeshow
*= require font-awesome
*= require scaffolds
*= require breakpoint-sass
*= require mobile-header
*= require viewports
*/

@charset "UTF-8";/*!*
.maintenance-banner-color {
background: #fff7a5;
padding-bottom:15px;
Expand Down Expand Up @@ -248,6 +252,10 @@ th, td {
top: 0px;
border-radius: 0px;
background: #FFFFFF;
@include breakpoint($breakpoint-medium) {
flex-flow: row wrap;
}

/*margin: 18px 1050px -15px 63px;*/
}

Expand Down Expand Up @@ -337,7 +345,6 @@ body {
.nav-link-colors {
text-decoration: none !important;
color: #000000 !important;
cursor: pointer !important;
}

a:hover {
Expand All @@ -348,7 +355,7 @@ a:hover {
text-decoration: none;
background-color: #B9292F !important;
height: 36px;
padding: 0px 87px;
padding-left: 47px
}

.breadcrumb-title-details {
Expand Down Expand Up @@ -637,7 +644,20 @@ a:hover {
padding: 15px 140px;
}*/

.hero__heading {
.breadcrumbs__heading {
font-weight: 300 !important;
color: #FFFFFF !important;
height: 77px !important;
font-weight: 300 !important;
letter-spacing: 0px !important;
line-height: 75px !important;
font-style: normal !important;
color: #FFFFFF !important;
font-size: 36px !important;
}


/*.breadcrumbs__heading {
--ui-black: #D23B42 !important;
font-weight: 300 !important;
color: #FFFFFF !important;
Expand All @@ -649,7 +669,7 @@ a:hover {
color: #FFFFFF !important;
font-size: 36px !important;
padding: 0px 46px !important;
}
}*/


h1 {
Expand Down Expand Up @@ -714,9 +734,9 @@ ul.list li:before {

.search-bar .button {
/*width: 94px;*/
height: 36px !important;
/*height: 36px !important;
padding: 7.5px 16px !important;
padding: 7px 13px !important;
padding: 7px 13px !important;*/
background: #000000 !important;
}

Expand Down Expand Up @@ -780,7 +800,7 @@ ul.list li:before {

.calendar_button {
height: 36px;
width: 165px;
/* width: 165px;*/
border-radius: 2px;
margin: 7px 32px 7px 0px;
}
Expand All @@ -802,3 +822,7 @@ ul.list li:before {
line-height: 27.5px;
color: #000000;
}




27 changes: 27 additions & 0 deletions app/assets/stylesheets/breakpoint-sass.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* Breakpoint Configuration
* @see https://github.com/Team-Sass/breakpoint/wiki
*
*/

/////////////////////
// Global Breakpoints

// Avoid using in favor of atomic, content-specific, breakpoints.
// These should be used for generic code, like layouts and typography, only. The CSS variables and the Sass variables below need to stay in sync.
// Sass' breakpoint() mixin doesn't work without Sass variables.
// CSS variables expose the breakpoint variables to consumers.
:root {
--breakpoint-small: 320px;
--breakpoint-medium: 600px;
--breakpoint-large: 960px;
--breakpoint-xl: 1280px;
}

$breakpoint-small: 320px;
$breakpoint-medium: 600px;
$breakpoint-large: 960px;
$breakpoint-xl: 1280px;
// The max-width breakpoint is used when the design should be applied at whatever the
// largest breakpoint is regardless of actual pixel value. e.g. removing outer margin on body wrapper
$max-width: $breakpoint-xl;
134 changes: 134 additions & 0 deletions app/assets/stylesheets/mobile-header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
@import 'viewports';

.navMenu-wrapper {
/*display: inline-block;
position: inherit;*/

@include min-screen(769px) {
display: none;
}
}

.mobileHeader {
@include min-screen(769px) {
display: none;
}
}

.navMenuList {
display: inline-block;
position: inherit;

@include max-screen(768px) {
display: none;
}
}


.header-mobile-navMenu {
display: inline-block;
padding: 0;
margin: 0 0 0 4px;
line-height: normal;
@include max-screen(768px) {
display: none;
}
}

.header-mobile-navMenu-wrapper {
/*box-shadow: 0 6px 4px rgb(100 100 100 / 40%);*/
line-height: normal;
margin-top: -2.5px;
position: absolute;
width: 100%;
z-index: 1000;
background-color: #FFF;
@include max-screen(768px) {
display: none;
}
}

.header-mobile-wrapper.active {
left: 0;
/*box-shadow: 0 6px 4px hsl(0deg 0% 39% / 40%);*/
line-height: normal;
margin-top: -2.5px;
position: absolute;
width: 100%;
z-index: 1000;
}


.header-mobile-navMenu-list {
display: none;
background-color: #2B2B2B;
padding: 10px 0;
margin: 0;
list-style-type: none;
text-align: right;
vertical-align: middle;
}

.navMenu {
position: relative;
display: block;
}

#navMenu-List {
display: block;
line-height: 40px !important;
}

.navMenu-List {
list-style-type: square !important;
}


.navMenu-wrapper {
/*box-shadow: 0 6px 4px rgba(100, 100, 100, 0.4);*/
line-height: normal;
margin-top: -2.5px;
position: absolute;
width: 100%;
z-index: 1000;
background-color: #FFF;
border-top: 1px solid #D23B42;
}

.mobileHeader-menuButton.active{
background-color: #D23B42 !important;
}

.menu-list {
cursor: pointer;
display: block;
position: relative;
}

.nav-menu-link {
cursor: pointer !important;
padding: 0 20px !important;
}

.menu-list .nav-menu-link:after {
content: "";
position: absolute;
left: 20px;
right: 20px;
display: block;
border-bottom: 1px dotted #000;
}

.icon-div {
display: block;
position: relative;
background: #FFF;
width: 100%;
top:266px;
}

.icon-shuttle {
position: absolute;
left: 67.5%;
background: #D23B42;
}
79 changes: 79 additions & 0 deletions app/assets/stylesheets/viewports.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/* --- Media Query Generator ---
* Reusable mixin used to generate
* variations of media query properties.
*/
@mixin generate-mq($args...) {
$media-type: 'only screen';
$media-type-key: 'media-type';
$args: keywords($args);
$expr: '';

@if map-has-key($args, $media-type-key) {
$media-type: map-get($args, $media-type-key);
$args: map-remove($args, $media-type-key);
}

@each $key, $value in $args {
@if $value {
$expr: "#{$expr} and (#{$key}: #{$value})";
}
}

@media #{$media-type} #{$expr} {
@content;
}
}

/* min-and-max-screen($min, $max, $orientation)
* $min - required
* $max - required
* $orientation - optional
* Ex: @include min-and-max-screen(768px, 1024px, landscape) { ... }
*/
@mixin min-and-max-screen($min, $max, $orientation: false) {
@include generate-mq($min-width: $min, $max-width: $max, $orientation: $orientation) {
@content;
}
}

/* max-screen($max, $orientation)
* $max - required
* $orientation - optional
* Ex #1: @include max-screen(768px, landscape) { ... }
* Ex #2: @include max-screen(768px) { ... }
*/
@mixin max-screen($max, $orientation: false) {
@include generate-mq($max-width: $max, $orientation: $orientation) {
@content;
}
}

/* min-screen($min, $orientation)
* $min - required
* $orientation - optional
* Ex #1: @include min-screen(768px, landscape) { ... }
* Ex #2: @include min-screen(768px) { ... }
*/
@mixin min-screen($min, $orientation: false) {
@include generate-mq($min-width: $min, $orientation: $orientation) {
@content;
}
}

/* landscape()
* Ex: @include landscape() { ... }
*/
@mixin landscape() {
@include generate-mq($orientation: landscape) {
@content;
}
}

/* portrait()
* Ex: @include portrait() { ... }
*/
@mixin portrait() {
@include generate-mq($orientation: portrait) {
@content;
}
}
Binary file added hero bkgd.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added hero left image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a8fe25f

Please sign in to comment.