Rebasing and fixing tests (281d1a91) · Commits · Gigadoc 2 / diaspora

app/assets/javascripts/app/views/aspect_view.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ app.views.Aspect = app.views.Base.extend({
		className: 'hoverable',

		events: {
		"click .entypo-check+a": "toggleAspect"
		"click .aspect-item": "toggleAspect"
		},

		toggleAspect: function(evt) {

app/assets/javascripts/app/views/sidebar.js

+1 −1

Original line number	Diff line number	Diff line
		// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later

		app.views.Sidebar = app.views.Base.extend({
		el: '.rightBar',
		el: '.rightbar',

		events: {
		'click input#invite_code': 'selectInputText'

app/assets/javascripts/app/views/tag_following_view.js

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ app.views.TagFollowing = app.views.Base.extend({
		tagName: "li",

		events : {
		"click .delete_tag_following": "destroyModel"
		"click .delete-tag-following": "destroyModel"
		},

		initialize : function(){

app/assets/stylesheets/color_themes/_color_theme_override.scss

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ body {
		}
		}

		#leftNavBar .hoverable:hover { background-color: $main-color-essence; }
		#left-navbar .hoverable:hover { background-color: $main-color-essence; }

		.poll_form .progress .bar { background-color: $main-color-dark; }

app/assets/stylesheets/leftnavbar.scss

+27 −81

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		height: 100%;
		}

		#leftNavBar {
		#left-navbar {
		background: $left-navbar-background;
		a {
		color: $link-grey;
		@@ -21,46 +21,54 @@
		}

		ul {
		margin: 0px;
		padding: 0px;
		margin: 0;
		padding: 0;
		list-style: none;
		&#stream_selection {
		margin: 0px -15px; /* -15px overrides Bootstrap's default gutter width */
		}
		}

		.selected { color: $black; }
		.selected a { color: $black; }
		.selected, .selected a { color: $black; }

		.hoverable {
		display: block;
		&.selected a, &.selected a:hover {
		&.selected a, &.selected a:hover,
		.followed-tags-sidebar a.hoverable.selected {
		color: white;
		background: #666;
		}
		}

		.all_aspects a.hoverable.selected, .followed_tags_sidebar a.hoverable.selected {
		color: white;
		background: #666;
		}

		.hoverable a, .all_aspects a.hoverable, .followed_tags_sidebar a.hoverable {
		a.hoverable, li.hoverable {
		padding: 10px 20px;
		display: block;
		font-weight: normal;
		color: $link-grey;
		border-bottom: 1px solid #ddd;
		&:hover, &:hover .entypo.check, &:hover + .action .entypo {
		&:hover, &:hover a,
		&:hover .entypo-check{
		background-color: $blue;
		color: $white;
		}
		&:not(:hover) [class^="entypo"] { visibility: hidden; }
		.entypo-check.selected { visibility: visible; }
		}

		#aspects_list, #tags_list {
		background: $left-navbar-drawer-background;
		li { padding: 0; }
		.selectable {
		display: block;
		overflow: hidden;
		text-overflow: ellipsis;
		padding: 10px 20px 10px 40px;
		}
		.action.modify_aspect, .action.delete-tag-following {
		position: relative;
		bottom: 30px;
		right: 20px;
		}
		}

		#home_user_badge {
		@@ -87,69 +95,7 @@
		}
		}

		#aspects_list {
		.hoverable {
		position: relative;
		}
		.selectable {
		padding-left: 40px;
		}
		}

		#aspects_list, #tags_list {
		background: $left-navbar-drawer-background;
		.hoverable > .action {
		visibility: hidden;
		margin: 0;
		position: absolute;
		right: 0;
		top: 0;
		z-index: 200;
		padding: 10px 15px;
		border: none;
		}
		.hoverable:hover > .action {
		visibility: visible;
		background: none;
		}
		}

		#aspects_list {
		.selectable {
		padding-right: 40px;
		}
		.entypo.check {
		visibility: hidden;
		margin: 0;
		position: absolute;
		left: 20px;
		top: 10px;
		z-index: 200;
		&.selected {
		visibility: visible;
		}
		}
		.selected + a {
		color: #333333;
		}
		}

		#tags_list {

		li {
		position: relative;
		}

		.selectable {
		padding-left: 30px;
		padding-right: 30px;
		}

		.delete_tag_following {
		font-size: 20px;
		line-height: 15px;
		}

		#new_tag_following {
		padding: 10px 20px 10px 30px;
		}