gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'misc-release-tweaks' into remove-schedule

Browse source 
* misc-release-tweaks: (38 commits)
  Improve markdown support and tweak sponsorship langage
  Use Ruby 2.5.5 since that is in the docker dev container
  Do not need to specify callback url
  attempt to fix the discourse callback URL
  use a div with padding.
  Help button is weird.
  Dropdown menu style tweaks
  fix logic for snap sso link
  tweak form display in dropdown
  Tweak devise modules list
  Work on omniauth setup
  Minor HTML cleanup
  More CSS-y things
  BJC-ify a bunch of styles
  More wording tweaks
  Tweak some wording, html and descriptions for Snap!Con
  Enable a bunch more markdown options.
  Delete some unnecessary files
  attempt one more fix
  readd back the group by
  ...
This commit is contained in:
Michael Ball 2020-01-05 15:44:35 -08:00
commit b49bddafb6
25 changed files with 170 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/osem-navbar.scss
View file

@ -29,7 +29,9 @@
}
}
.dropdown-menu {
padding: 17px;
min-width: 225px;
}
.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
color: #FFF;
}
}

19
app/assets/stylesheets/osem-splash.scss
View file

@ -116,14 +116,13 @@
}
#social-media{
background: none repeat scroll 0 0 #2f2f2f;
padding-top: 60px;
padding-bottom: 60px;
background: none repeat scroll 0 0 #0C3559;
padding: 50px 20px;
i{
color: #4a4a4a;
color: #FFF;
}
i:hover{
color: #16a085;
color: #F2E205;
}
a{
padding-left: 100px;
@ -164,11 +163,11 @@
i.fa {
line-height: inherit;
}
&.show {
visibility:visible;
cursor:pointer;
opacity: 1.0;
}
// &.show {
// visibility:visible;
// cursor:pointer;
// opacity: 1.0;
// }
a {
color: white;
}

2
app/assets/stylesheets/osem.scss
View file

@ -13,7 +13,7 @@ body {
}
#content {
padding-bottom: 60px;
padding-bottom: 45px;
}
#footer {

6
app/assets/stylesheets/strap-on.scss
View file

@ -1,9 +1,9 @@
$navbar-default-bg: #299a0b;
$navbar-default-link-active-bg: #DFE0DF;
$navbar-default-bg: #0C3559;
$navbar-default-link-active-bg: rgb(8,8,8);
$navbar-default-border: 1px solid #d4d4d4;
$navbar-default-color: #ffffff;
$navbar-default-link-color: #ffffff;
$navbar-default-link-hover-color: #000000;
$navbar-default-link-hover-color: #F2E205;
@import 'bootstrap-datetimepicker';
@import "bootstrap-sprockets";