nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set max-width to 1200px for container-fluid

Browse source
This commit is contained in:
Steffen van Bergerem 2016-02-06 13:18:00 +01:00
parent 0c34452840
commit 03ef5bd064
14 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/base.scss
View file

@ -3,6 +3,13 @@ body {
padding: none;
}
.container-fluid { max-width: $screen-lg-min; }
.page-streams,
.page-tags.action-show {
> .container-fluid { max-width: 100%; }
}
// Overflow
h1,
h2,

7
app/assets/stylesheets/conversations.scss
View file

@ -191,11 +191,12 @@
}
}
@media (max-width: 1354px) {
#left_pane #conversation_inbox .pagination ul > li > a {
// We need this to override the Bootstrap pagination style only for the conversations view
// scss-lint:disable SelectorDepth
.conversation-inbox .pagination > li > a {
padding: 4px 7px;
}
}
// scss-lint:enable SelectorDepth
#new_conversation_pane {
ul.as-selections { width: 100% !important; }

1
app/assets/stylesheets/header.scss
View file

@ -9,7 +9,6 @@
}
@media (max-width: $grid-float-breakpoint-max) {
.col-lg-10 { padding: 0; }
.navbar-header > .nav li { display: inline-block !important; }
.nav-badge {
color: $navbar-inverse-link-color;

2
app/assets/templates/header_tpl.jst.hbs
View file

@ -1,7 +1,7 @@
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="row">
<div class="col-lg-10 col-lg-offset-1">
<div class="col-md-12">
<div class="navbar-header">
<button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-collapse">
<span class="sr-only">{{t "header.toggle_navigation"}}</span>

4
app/views/api/openid_connect/user_applications/index.html.haml
View file

@ -3,10 +3,10 @@
.container-fluid.applications-page
.row
.col-lg-10.col-lg-offset-1
.col-md-12
= render "shared/settings_nav"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
%h3= t(".title")
.row
.col-md-12

2
app/views/api/openid_connect/user_applications/index.mobile.haml
View file

@ -1,6 +1,6 @@
.container-fluid.settings_container.applications-page
.row
.col-lg-10.col-lg-offset-1
.col-md-12
- content_for :page_title do
= t(".edit_applications")
= render "shared/settings_nav"

5
app/views/conversations/index.haml
View file

@ -14,7 +14,7 @@
= link_to t('.new_conversation'), conversations_path, class: 'btn btn-default'
= t('.inbox')
#conversation_inbox
.conversation-inbox#conversation_inbox
.stream.conversations
- if @visibilities.count > 0
= render partial: "conversations/conversation", collection: @visibilities, as: :visibility
@ -34,8 +34,7 @@
- else
.stream_container.hidden
#conversation_show
.row#conversation_new
.col-md-10.col-md-offset-1
#conversation_new
.new-conversation
%h3.text-center
= t("conversations.index.new_conversation")

2
app/views/layouts/_header.html.haml
View file

@ -8,7 +8,7 @@
%nav.navbar.navbar-inverse.navbar-fixed-top
.container-fluid
.row
.col-lg-10.col-lg-offset-1
.col-md-12
.navbar-header
%button.navbar-toggle.collapsed{type: "button", data: {toggle: "collapse", target: "#navbar-collapse"}}
%span.sr-only

4
app/views/profiles/edit.haml
View file

@ -4,11 +4,11 @@
.container-fluid
.row
.col-lg-10.col-lg-offset-1
.col-md-12
= render "shared/settings_nav"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
- content_for :submit_block do
= link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
= submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"

4
app/views/profiles/edit.mobile.haml
View file

@ -4,11 +4,11 @@
.settings_container.container-fluid
.row
.col-lg-10.col-lg-offset-1
.col-md-12
= render "shared/settings_nav"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
- content_for :submit_block do
= link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
= submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"

8
app/views/services/index.html.haml
View file

@ -7,16 +7,16 @@
.container-fluid
.row
.col-lg-10.col-lg-offset-1
.col-md-12
= render "shared/settings_nav"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
%h3= t(".title")
.row
.col-md-7.col-lg-5.col-lg-offset-2
.col-md-7
= render "add_remove_services"
.col-md-5.col-lg-3
.col-md-5
%p
= t(".services_explanation")

6
app/views/services/index.mobile.haml
View file

@ -7,14 +7,14 @@
.settings_container.services_page.container-fluid
.row
.col-lg-10.col-lg-offset-1
.col-md-12
= render "shared/settings_nav"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
= render "add_remove_services"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
.services_explanation
= t(".services_explanation")

8
app/views/users/_edit.haml
View file

@ -6,11 +6,11 @@
= t(".edit_account")
.row
.col-lg-10.col-lg-offset-1
.col-md-12
= render "shared/settings_nav"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
.row
.col-md-6
%h3= t(".your_handle")
@ -173,7 +173,7 @@
%hr
.row
.col-lg-7#account_data
.col-md-12#account_data
.row
.col-md-6
%h3= t(".export_data")
@ -208,7 +208,7 @@
= link_to t(".request_export_photos"), export_photos_user_path, method: :post,
class: "btn btn-default btn-block"
.col-lg-5
.col-md-12
%h3
= t(".close_account_text")
.form-group

4
app/views/users/_privacy_settings.haml
View file

@ -1,9 +1,9 @@
.row
.col-lg-10.col-lg-offset-1
.col-md-12
= render "shared/settings_nav"
.row
.col-lg-8.col-lg-offset-2
.col-md-12
.row
.col-md-12
%h3