Commit 66b17673eed99eb8cc6688027b3786a084df73ed
Exists in
master
and in
4 other branches
Merge pull request #85 from colab/split_screen
Split screen css link to base html
Showing
4 changed files
with
51 additions
and
48 deletions
Show diff stats
| ... | ... | @@ -0,0 +1,46 @@ |
| 1 | +/* Header */ | |
| 2 | + | |
| 3 | +#header-searchbox { | |
| 4 | + width: 190px; | |
| 5 | +} | |
| 6 | + | |
| 7 | +#header-hr { | |
| 8 | + margin-top: 0; | |
| 9 | +} | |
| 10 | + | |
| 11 | +.navbar-default .navbar-brand, | |
| 12 | +.navbar a.dropdown-toggle.user { | |
| 13 | + padding: 0; | |
| 14 | + margin-top: 5px; | |
| 15 | + margin-left: 10px; | |
| 16 | +} | |
| 17 | + | |
| 18 | +.navbar-brand img { | |
| 19 | + height: 40px; | |
| 20 | +} | |
| 21 | + | |
| 22 | +#user-menu .wrapper { | |
| 23 | + padding: 3px 10px; | |
| 24 | + white-space: nowrap; | |
| 25 | +} | |
| 26 | + | |
| 27 | +#user-menu .wrapper a { | |
| 28 | + margin: 5px 0; | |
| 29 | +} | |
| 30 | + | |
| 31 | +#user-menu .user-info { | |
| 32 | + display: inline-block; | |
| 33 | + vertical-align: top; | |
| 34 | + padding-left: 5px; | |
| 35 | +} | |
| 36 | + | |
| 37 | +#user-menu .user-info span { | |
| 38 | + display: block; | |
| 39 | +} | |
| 40 | + | |
| 41 | +#user-menu .dropdown-menu .thumbnail { | |
| 42 | + width: 100px; | |
| 43 | + display: inline-block; | |
| 44 | +} | |
| 45 | + | |
| 46 | +/* End of Header */ | |
| 0 | 47 | \ No newline at end of file | ... | ... |
colab/static/css/screen.css
| ... | ... | @@ -7,54 +7,6 @@ li hr { |
| 7 | 7 | margin: 10px 0; |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | -/* Header */ | |
| 11 | - | |
| 12 | -#header-searchbox { | |
| 13 | - width: 190px; | |
| 14 | -} | |
| 15 | - | |
| 16 | -#header-hr { | |
| 17 | - margin-top: 0; | |
| 18 | -} | |
| 19 | - | |
| 20 | -.navbar-default .navbar-brand, | |
| 21 | -.navbar a.dropdown-toggle.user { | |
| 22 | - padding: 0; | |
| 23 | - margin-top: 5px; | |
| 24 | - margin-left: 10px; | |
| 25 | -} | |
| 26 | - | |
| 27 | -.navbar-brand img { | |
| 28 | - height: 40px; | |
| 29 | -} | |
| 30 | - | |
| 31 | -#user-menu .wrapper { | |
| 32 | - padding: 3px 10px; | |
| 33 | - white-space: nowrap; | |
| 34 | -} | |
| 35 | - | |
| 36 | -#user-menu .wrapper a { | |
| 37 | - margin: 5px 0; | |
| 38 | -} | |
| 39 | - | |
| 40 | -#user-menu .user-info { | |
| 41 | - display: inline-block; | |
| 42 | - vertical-align: top; | |
| 43 | - padding-left: 5px; | |
| 44 | -} | |
| 45 | - | |
| 46 | -#user-menu .user-info span { | |
| 47 | - display: block; | |
| 48 | -} | |
| 49 | - | |
| 50 | -#user-menu .dropdown-menu .thumbnail { | |
| 51 | - width: 80px; | |
| 52 | - display: inline-block; | |
| 53 | -} | |
| 54 | - | |
| 55 | -/* End of Header */ | |
| 56 | - | |
| 57 | - | |
| 58 | 10 | /* From message-preview.html*/ |
| 59 | 11 | .quiet { |
| 60 | 12 | color: #999; | ... | ... |
colab/templates/base.html
| ... | ... | @@ -47,6 +47,11 @@ |
| 47 | 47 | <link rel="stylesheet" href="{% static 'css/screen.css' %}" |
| 48 | 48 | type="text/css" media="screen" /> |
| 49 | 49 | |
| 50 | + <link rel="stylesheet" href="{% static 'css/header.css' %}" | |
| 51 | + type="text/css" media="screen" /> | |
| 52 | + | |
| 53 | + <link rel="stylesheet" href="{% static 'css/footer.css' %}" | |
| 54 | + type="text/css" media="screen" /> | |
| 50 | 55 | {% endblock %} |
| 51 | 56 | </head> |
| 52 | 57 | ... | ... |