From c1995119cca699cd995efdd8e8d22c1dfd5700d9 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Mon, 7 Sep 2015 15:01:47 -0300 Subject: [PATCH] Sync --- src/app/components/navbar/navbar.html | 24 +++++++++++++++++++----- src/app/components/navbar/navbar.scss | 4 ++++ src/app/components/social-share/social-share.directive.js | 30 ++++++++++++++++++++++++++++++ src/app/components/social-share/social-share.html | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/components/social-share/social-share.scss | 2 ++ src/app/components/socialShare/socialShare.directive.js | 30 ------------------------------ src/app/components/socialShare/socialShare.html | 35 ----------------------------------- src/app/components/socialShare/socialShare.scss | 24 ------------------------ src/app/index.scss | 2 +- src/app/pages/programas/programa.html | 6 ++---- src/app/pages/programas/programas.scss | 6 ++++++ src/assets/images/icons/social-share-small.png | Bin 902 -> 0 bytes src/assets/images/icons/sprite.png | Bin 109200 -> 0 bytes 13 files changed, 138 insertions(+), 99 deletions(-) create mode 100644 src/app/components/social-share/social-share.directive.js create mode 100644 src/app/components/social-share/social-share.html create mode 100644 src/app/components/social-share/social-share.scss delete mode 100644 src/app/components/socialShare/socialShare.directive.js delete mode 100644 src/app/components/socialShare/socialShare.html delete mode 100644 src/app/components/socialShare/socialShare.scss diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html index b77f5d3..8ea1894 100644 --- a/src/app/components/navbar/navbar.html +++ b/src/app/components/navbar/navbar.html @@ -23,21 +23,35 @@
  • - diff --git a/src/app/components/navbar/navbar.scss b/src/app/components/navbar/navbar.scss index 34792c9..616e426 100644 --- a/src/app/components/navbar/navbar.scss +++ b/src/app/components/navbar/navbar.scss @@ -44,6 +44,10 @@ } } + .dropdown-menu { + padding: 0; + } + .navbar-nav > li { & > a { diff --git a/src/app/components/social-share/social-share.directive.js b/src/app/components/social-share/social-share.directive.js new file mode 100644 index 0000000..3463bcf --- /dev/null +++ b/src/app/components/social-share/social-share.directive.js @@ -0,0 +1,30 @@ +(function() { + 'use strict'; + + angular + .module('dialoga') + .directive('socialShare', socialShare); + + /** @ngInject */ + function socialShare() { + var directive = { + restrict: 'E', + templateUrl: 'app/components/social-share/social-share.html', + scope: { + }, + controller: SocialShareController, + controllerAs: 'vm', + bindToController: true + }; + + return directive; + + /** @ngInject */ + function SocialShareController($log) { + $log.debug('SocialShareController'); + + // var vm = this; + } + } + +})(); diff --git a/src/app/components/social-share/social-share.html b/src/app/components/social-share/social-share.html new file mode 100644 index 0000000..6c8856c --- /dev/null +++ b/src/app/components/social-share/social-share.html @@ -0,0 +1,74 @@ + + + diff --git a/src/app/components/social-share/social-share.scss b/src/app/components/social-share/social-share.scss new file mode 100644 index 0000000..341182a --- /dev/null +++ b/src/app/components/social-share/social-share.scss @@ -0,0 +1,2 @@ +.social-share { +} diff --git a/src/app/components/socialShare/socialShare.directive.js b/src/app/components/socialShare/socialShare.directive.js deleted file mode 100644 index d61e84f..0000000 --- a/src/app/components/socialShare/socialShare.directive.js +++ /dev/null @@ -1,30 +0,0 @@ -(function() { - 'use strict'; - - angular - .module('dialoga') - .directive('socialShare', socialShare); - - /** @ngInject */ - function socialShare() { - var directive = { - restrict: 'E', - templateUrl: 'app/components/socialShare/socialShare.html', - scope: { - }, - controller: SocialShareController, - controllerAs: 'vm', - bindToController: true - }; - - return directive; - - /** @ngInject */ - function SocialShareController($log) { - $log.debug('SocialShareController'); - - // var vm = this; - } - } - -})(); diff --git a/src/app/components/socialShare/socialShare.html b/src/app/components/socialShare/socialShare.html deleted file mode 100644 index 1265be8..0000000 --- a/src/app/components/socialShare/socialShare.html +++ /dev/null @@ -1,35 +0,0 @@ - - - diff --git a/src/app/components/socialShare/socialShare.scss b/src/app/components/socialShare/socialShare.scss deleted file mode 100644 index 7efe3c0..0000000 --- a/src/app/components/socialShare/socialShare.scss +++ /dev/null @@ -1,24 +0,0 @@ -.social-share { - ul { - display: inline-block; - vertical-align: middle; - list-style: none; - padding-left: 0; - } - - li{ - display: inline-block; - padding: 0 2px !important; - vertical-align: top; - } - - .social-share--description { - display: inline-block; - color: #000; - font-size: 12px; - font-weight: 300; - padding-right: 10px; - text-align: right; - vertical-align: middle; - } -} diff --git a/src/app/index.scss b/src/app/index.scss index 0832347..689ca1b 100644 --- a/src/app/index.scss +++ b/src/app/index.scss @@ -133,7 +133,7 @@ body { } -.dropdown-menu.dropdown-menu-social { +.social-share { min-width: 200px; background-color: #eee; padding: 5px; diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html index a928dc5..589ef06 100644 --- a/src/app/pages/programas/programa.html +++ b/src/app/pages/programas/programa.html @@ -41,10 +41,8 @@

    Lorem ipsum dolor sit amet, ea veniam mucius ocurreret vix, ius ex nisl vidisse partiendo. Blandit nominavi cum ei, paulo quaestio his ei, eum minim salutandi in. Civibus albucius in quo, et eam posse facilisis. Debet suavitate sea ut, his ei feugiat fastidii eleifend. Quo ex quando maiestatis voluptatum, mel te perpetua maiestatis, sit ceteros legendos deserunt ea. Enim dolores moderatius eu pro, ad quo ignota aliquid meliore.

    diff --git a/src/app/pages/programas/programas.scss b/src/app/pages/programas/programas.scss index 52a7a9a..d1e7934 100644 --- a/src/app/pages/programas/programas.scss +++ b/src/app/pages/programas/programas.scss @@ -51,6 +51,12 @@ position: relative; } + .program-preview--share-label, + .program-preview--share-directive { + display: inline-block; + vertical-align: middle; + } + h2, h3{ font-weight: bold; diff --git a/src/assets/images/icons/social-share-small.png b/src/assets/images/icons/social-share-small.png index 716c234..a644784 100644 Binary files a/src/assets/images/icons/social-share-small.png and b/src/assets/images/icons/social-share-small.png differ diff --git a/src/assets/images/icons/sprite.png b/src/assets/images/icons/sprite.png index c553a49..95efc05 100644 Binary files a/src/assets/images/icons/sprite.png and b/src/assets/images/icons/sprite.png differ -- libgit2 0.21.2