| Index: static/scss/_base.scss |
| =================================================================== |
| rename from scss/_base.scss |
| rename to static/scss/_base.scss |
| --- a/scss/_base.scss |
| +++ b/static/scss/_base.scss |
| @@ -1,25 +1,23 @@ |
| -/*! |
| - * This file is part of website-defaults |
| - * Copyright (C) 2016-present eyeo GmbH |
| - * |
| - * website-defaults is free software: you can redistribute it and/or |
| - * modify it under the terms of the GNU General Public License as published by |
| - * the Free Software Foundation, either version 3 of the License, or |
| - * (at your option) any later version. |
| - * |
| - * website-defaults is distributed in the hope that it will be useful, |
| - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| - * GNU General Public License for more details. |
| - * |
| - * You should have received a copy of the GNU General Public License |
| - * along with website-defaults. If not, see <http://www.gnu.org/licenses/>. |
| - */ |
| +// This file is part of website-defaults |
| +// Copyright (C) 2016-present eyeo GmbH |
| +// |
| +// website-defaults is free software: you can redistribute it and/or |
| +// modify it under the terms of the GNU General Public License as published by |
| +// the Free Software Foundation, either version 3 of the License, or |
| +// (at your option) any later version. |
| +// |
| +// website-defaults is distributed in the hope that it will be useful, |
| +// but WITHOUT ANY WARRANTY; without even the implied warranty of |
| +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| +// GNU General Public License for more details. |
| +// |
| +// You should have received a copy of the GNU General Public License |
| +// along with website-defaults. If not, see <http://www.gnu.org/licenses/>. |
| /******************************************************************************* |
| * Base styles |
| ******************************************************************************/ |
| html |
| { |
| color: $primary; |
| @@ -60,15 +58,18 @@ |
| @media(min-width: $desktop-breakpoint) |
| { |
| .container |
| { |
| width: $desktop-width; |
| } |
| } |
| -@media(min-width: $large-desktop-breakpoint) |
| +@if $enable-large-desktop |
|
ire
2017/10/17 08:33:45
I also added this
|
| { |
| - .container |
| + @media(min-width: $large-desktop-breakpoint) |
| { |
| - width: $large-desktop-width; |
| + .container |
| + { |
| + width: $large-desktop-width; |
| + } |
| } |
| } |