glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

annoying scroll issue fix (#634)

Browse source
This commit is contained in:
Connor Turland 2016-09-09 17:06:05 -04:00 committed by GitHub
parent 61465ff148
commit 75260496be
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/application.css.erb
View file

@ -82,7 +82,7 @@ body {
font-family: 'din-medium', helvetica, sans-serif; font-family: 'din-medium', helvetica, sans-serif;
color: #424242; color: #424242;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
overflow-x: hidden;
} }
h1, h1,
h2, h2,

14
app/assets/stylesheets/junto.css.erb
View file

@ -99,7 +99,7 @@
float: right; float: right;
height: 100%; height: 100%;
background: #424242; background: #424242;
box-shadow: 0px 0px 16px 8px rgba(0, 0, 0, 0.23), -2px 10px 10px rgba(0, 0, 0, 0.19); box-shadow: -8px 0px 16px 2px rgba(0, 0, 0, 0.23);
} }
.chat-box .chat-button { .chat-box .chat-button {
position: absolute; position: absolute;
@ -130,14 +130,14 @@
line-height: 20px; line-height: 20px;
} }
.chat-box .junto-header { .chat-box .junto-header {
width: 100%; width: 276px;
padding: 16px 8px 16px 16px; padding: 16px 8px 16px 16px;
font-size: 16px; font-size: 16px;
text-align: left; text-align: left;
font-weight: bold; font-weight: bold;
background-color: #000000; background-color: #000000;
color: #f5f5f5; color: #f5f5f5;
box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19); box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23);
} }
.chat-box .junto-header .cursor-toggle { .chat-box .junto-header .cursor-toggle {
width: 32px; width: 32px;
@ -156,7 +156,7 @@
.chat-box .junto-header .video-toggle { .chat-box .junto-header .video-toggle {
width: 32px; width: 32px;
height: 32px; height: 32px;
margin-right: 32px; margin-right: 10px;
margin-top: -8px; margin-top: -8px;
float: right; float: right;
background: url(<%= asset_path 'video_sprite.png' %>) no-repeat; background: url(<%= asset_path 'video_sprite.png' %>) no-repeat;
@ -263,19 +263,19 @@
display: block; display: block;
} }
.chat-box .chat-header { .chat-box .chat-header {
width: 100%; width: 276px;
padding: 16px 8px 16px 16px; padding: 16px 8px 16px 16px;
font-size: 16px; font-size: 16px;
text-align: left; text-align: left;
font-weight: bold; font-weight: bold;
background-color: #000000; background-color: #000000;
color: #f5f5f5; color: #f5f5f5;
box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19); box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23);
} }
.chat-box .chat-header .sound-toggle { .chat-box .chat-header .sound-toggle {
width: 24px; width: 24px;
height: 24px; height: 24px;
margin-right: 32px; margin-right: 10px;
margin-top: -2px; margin-top: -2px;
float: right; float: right;
background: url(<%= asset_path 'sound_sprite.png' %>) no-repeat; background: url(<%= asset_path 'sound_sprite.png' %>) no-repeat;