Skip to content

Commit

Permalink
Merge pull request #1 from project-sunbird/release-1.14.0
Browse files Browse the repository at this point in the history
Release 1.14.0
  • Loading branch information
sivashanmugam-funtoot authored Jan 29, 2019
2 parents f0e4b1f + 0a62b3f commit b1b55de
Show file tree
Hide file tree
Showing 123 changed files with 154,167 additions and 533 deletions.
44 changes: 43 additions & 1 deletion org.ekstep.collaborator-1.2/editor/collaborator.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,21 @@
font-weight: bold;
}

.overLap-all {
.header-height {
height: 82px;
}

.overlap-all {
z-index: 9999;
}

/* SearchBar */
.view-all {
padding-left:5px;
font-size: 14px;
font-weight:600
}

.searcher .search-reset-keyword-field .search-loader {
height: 100%;
margin: 3%;
Expand Down Expand Up @@ -99,6 +109,21 @@
margin-top: 0 !important;
}

.dropdown-menu {
right: 0 !important;
left: auto !important;
}

.card-height {
height:80px;
}

.profile-avatar {
margin-bottom: 0;
height: 50px;
width: 50px;
}

.ui.cards>.card .content img {
border-radius: 50%;
}
Expand Down Expand Up @@ -142,6 +167,12 @@ button.clear-btn:focus {
width: 100%;
}

.content-search-img {
padding-bottom: 20px;
padding-top: 20px;
text-align: center;
}

/* Footer */
.footer-element {
bottom: 0%;
Expand Down Expand Up @@ -184,4 +215,15 @@ button.clear-btn:focus {

.margin-bottom-0 {
margin-bottom: 0;
}

.float-right {
float: right;
}

.margin-top-5 {
margin-top: 5px;
}
.font-size-1 {
font-size: 1rem !important;
}
102 changes: 43 additions & 59 deletions org.ekstep.collaborator-1.2/editor/collaborator.html

Large diffs are not rendered by default.

343 changes: 193 additions & 150 deletions org.ekstep.collaborator-1.2/editor/collaboratorApp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion org.ekstep.collaborator-1.2/editor/plugin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b1b55de

Please sign in to comment.