Преглед изворни кода

Label actions with text rather than icons

James Allen пре 8 година
родитељ
комит
d84580f12d

+ 9 - 10
services/web/app/views/project/editor/history.pug

@@ -134,18 +134,17 @@ div#history(ng-show="ui.view == 'history'")
 
 
 					div.description(ng-click="select()")
 					div.description(ng-click="select()")
 						div.time {{ update.meta.end_ts | formatDate:'h:mm a' }}
 						div.time {{ update.meta.end_ts | formatDate:'h:mm a' }}
+						div.action.action-edited(ng-if="history.isV2 && update.pathnames.length > 0")
+							| Edited
 						div.docs(ng-repeat="pathname in update.pathnames")
 						div.docs(ng-repeat="pathname in update.pathnames")
-							i.fa.fa-pencil(ng-if="history.isV2")
-							span.doc {{ pathname }}
+							.doc {{ pathname }}
 						div.docs(ng-repeat="project_op in update.project_ops")
 						div.docs(ng-repeat="project_op in update.project_ops")
-							span(ng-if="project_op.rename")
-								span Renamed 
-								span.doc {{ project_op.rename.pathname }}
-								span  to 
-								span.doc {{ project_op.rename.newPathname }}
-							span(ng-if="project_op.add")
-								span Added 
-								span.doc {{ project_op.add.pathname }}
+							div(ng-if="project_op.rename")
+								.action Renamed
+								.doc {{ project_op.rename.pathname }} → {{ project_op.rename.newPathname }}
+							div(ng-if="project_op.add")
+								.action Created
+								.doc {{ project_op.add.pathname }}
 						div.users
 						div.users
 							div.user(ng-repeat="update_user in update.meta.users")
 							div.user(ng-repeat="update_user in update.meta.users")
 								.color-square(ng-if="update_user != null", ng-style="{'background-color': 'hsl({{ update_user.hue }}, 70%, 50%)'}")
 								.color-square(ng-if="update_user != null", ng-style="{'background-color': 'hsl({{ update_user.hue }}, 70%, 50%)'}")

+ 10 - 10
services/web/public/stylesheets/app/editor/history.less

@@ -169,18 +169,18 @@
 					font-size: 0.8rem;
 					font-size: 0.8rem;
 					line-height: @line-height-computed;
 					line-height: @line-height-computed;
 				}
 				}
-				.action {
+				.doc {
 					font-size: 0.9rem;
 					font-size: 0.9rem;
+					font-weight: bold;
 				}
 				}
-				.docs {
-					font-size: 0.9rem;
-					.doc {
-						font-weight: bold;
-					}
-					i {
-						font-size: 0.8rem;
-						color: @gray;
-						margin-right: 4px;
+				.action {
+					color: @gray;
+					text-transform: uppercase;
+					font-size: 0.7em;
+					margin-bottom: -2px;
+					margin-top: 2px;
+					&-edited {
+						margin-top: 0;
 					}
 					}
 				}
 				}
 			}
 			}