From 70e95f612343413c761dbea187fab1236eccdf3a Mon Sep 17 00:00:00 2001 From: Elliot Hesp Date: Thu, 4 Dec 2014 21:56:54 +0000 Subject: [PATCH] Started on dashboard content area --- app/assets/sass/main.scss | 2 ++ app/assets/sass/modules/_tabs.scss | 13 +++++++++ app/assets/sass/partials/_content.scss | 20 ++++++++++++++ app/assets/sass/partials/_wrapper.scss | 1 + app/views/dashboard/index.blade.php | 24 ++++++++++++++--- .../{all-5d1bb07a.css => all-54061ae6.css} | 27 +++++++++++++++++++ public/build/css/all.css | 27 +++++++++++++++++++ public/build/rev-manifest.json | 2 +- 8 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 app/assets/sass/modules/_tabs.scss rename public/build/css/{all-5d1bb07a.css => all-54061ae6.css} (99%) diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 6df9742d..b1d4e88d 100644 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -2,6 +2,8 @@ html, body { height: 100%; } +@import "modules/tabs"; + @import "partials/base"; @import "partials/wrapper"; @import "partials/header"; diff --git a/app/assets/sass/modules/_tabs.scss b/app/assets/sass/modules/_tabs.scss new file mode 100644 index 00000000..2203fc74 --- /dev/null +++ b/app/assets/sass/modules/_tabs.scss @@ -0,0 +1,13 @@ +ul.tabs { + margin: 0; + padding: 0; + list-style: none; + border-bottom: 1px solid #d5d8d7; + li { + display: inline; + a { + display: inline-block; + padding: 15px 30px; + } + } +} \ No newline at end of file diff --git a/app/assets/sass/partials/_content.scss b/app/assets/sass/partials/_content.scss index 25e54388..9281bddc 100644 --- a/app/assets/sass/partials/_content.scss +++ b/app/assets/sass/partials/_content.scss @@ -1,4 +1,24 @@ body.dashboard { .content { + .row { + margin: 10px 0; + } + .header { + background: #ffffff; + padding: 14px; + width: 100%; + height: 50px; + font-size: 18px; + i { + padding-right: 10px; + } + input, button, .btn { + position: relative; + top: -4px; + } + input { + width: 20%; + } + } } } \ No newline at end of file diff --git a/app/assets/sass/partials/_wrapper.scss b/app/assets/sass/partials/_wrapper.scss index 01d7c5ee..1c441acc 100644 --- a/app/assets/sass/partials/_wrapper.scss +++ b/app/assets/sass/partials/_wrapper.scss @@ -1,5 +1,6 @@ body.dashboard { .wrapper { + width: 100%; position: absolute; top: 0; bottom: 0; diff --git a/app/views/dashboard/index.blade.php b/app/views/dashboard/index.blade.php index 78328b58..c473dabb 100644 --- a/app/views/dashboard/index.blade.php +++ b/app/views/dashboard/index.blade.php @@ -1,8 +1,24 @@ @extends('layout.dashboard') @section('content') -
- Dashboard -
- +
+ Dashboard + +
+
+
+ +
+
Tab 1
+
Tab 2
+
Tab 3
+
Tab 4
+
+
+
@stop diff --git a/public/build/css/all-5d1bb07a.css b/public/build/css/all-54061ae6.css similarity index 99% rename from public/build/css/all-5d1bb07a.css rename to public/build/css/all-54061ae6.css index 651d03c9..11559766 100644 --- a/public/build/css/all-5d1bb07a.css +++ b/public/build/css/all-54061ae6.css @@ -10,6 +10,17 @@ html, body { height: 100%; } +ul.tabs { + margin: 0; + padding: 0; + list-style: none; + border-bottom: 1px solid #d5d8d7; } + ul.tabs li { + display: inline; } + ul.tabs li a { + display: inline-block; + padding: 15px 30px; } + body.dashboard { font-family: "Helvetica Neue", Helvetica, "Open Sans", sans-serif; font-weight: lighter; @@ -17,6 +28,7 @@ body.dashboard { background: #f5f5f5; } body.dashboard .wrapper { + width: 100%; position: absolute; top: 0; bottom: 0; @@ -114,3 +126,18 @@ body.dashboard .sidebar { body.dashboard .sidebar ul li a:hover { text-decoration: none; } +body.dashboard .content .row { + margin: 10px 0; } +body.dashboard .content .header { + background: #ffffff; + padding: 14px; + width: 100%; + height: 50px; + font-size: 18px; } + body.dashboard .content .header i { + padding-right: 10px; } + body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn { + position: relative; + top: -4px; } + body.dashboard .content .header input { + width: 20%; } diff --git a/public/build/css/all.css b/public/build/css/all.css index 651d03c9..11559766 100644 --- a/public/build/css/all.css +++ b/public/build/css/all.css @@ -10,6 +10,17 @@ html, body { height: 100%; } +ul.tabs { + margin: 0; + padding: 0; + list-style: none; + border-bottom: 1px solid #d5d8d7; } + ul.tabs li { + display: inline; } + ul.tabs li a { + display: inline-block; + padding: 15px 30px; } + body.dashboard { font-family: "Helvetica Neue", Helvetica, "Open Sans", sans-serif; font-weight: lighter; @@ -17,6 +28,7 @@ body.dashboard { background: #f5f5f5; } body.dashboard .wrapper { + width: 100%; position: absolute; top: 0; bottom: 0; @@ -114,3 +126,18 @@ body.dashboard .sidebar { body.dashboard .sidebar ul li a:hover { text-decoration: none; } +body.dashboard .content .row { + margin: 10px 0; } +body.dashboard .content .header { + background: #ffffff; + padding: 14px; + width: 100%; + height: 50px; + font-size: 18px; } + body.dashboard .content .header i { + padding-right: 10px; } + body.dashboard .content .header input, body.dashboard .content .header button, body.dashboard .content .header .btn { + position: relative; + top: -4px; } + body.dashboard .content .header input { + width: 20%; } diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index a82c3206..c3905ead 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,4 +1,4 @@ { - "css/all.css": "css/all-5d1bb07a.css", + "css/all.css": "css/all-54061ae6.css", "js/all.js": "js/all-86e91591.js" } \ No newline at end of file