Skip to content

Commit f219be9

Browse files
authored
Merge pull request #151 from BuildFire/feat/search-engine
Feat/search engine
2 parents 281ed3b + 11145a3 commit f219be9

26 files changed

+1088
-488
lines changed

control/content/app.services.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
if (err) {
3030
return deferred.reject(err);
3131
} else if (result) {
32+
if (result && result.data && result.data.content && result.data.content.feeds) {
33+
result.data.content.feeds = result.data.content.feeds.map(feed => new Feed(feed));
34+
}
3235
return deferred.resolve(result);
3336
}
3437
};
@@ -84,11 +87,11 @@
8487
};
8588
}])
8689
.factory("Utils", ['$q', '$http', function ($q, $http) {
87-
var _nanoid = function(t=21) {
90+
var nanoid = function(t=21) {
8891
return crypto.getRandomValues(new Uint8Array(t)).reduce(((t,e)=>t+=(e&=63)<36?e.toString(36):e<62?(e-26).toString(36).toUpperCase():e>62?'-':'_'),'');
8992
}
9093
return {
91-
_nanoid: _nanoid
94+
nanoid: nanoid
9295
};
9396
}]);
9497
})(window.angular, window.buildfire);

control/content/assets/css/base.css

Lines changed: 110 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ html {
2222
font-size: 16px !important;
2323
}
2424

25-
body {
25+
body, h1, h2, h3, h4, h5, h6, label, p, span {
2626
font-family: 'Conv_apercu_regular', 'Helvetica', 'Sans-Serif', 'Arial';
2727
}
2828

@@ -441,61 +441,129 @@ p.info__note.info__note--transparent {
441441
margin-bottom: 0;
442442
}
443443

444-
.bf-tooltip {
445-
display: inline-flex;
446-
position: relative;
447-
cursor: default;
444+
/* tooltip */
445+
.tooltip-container {
446+
display: flex;
447+
align-items: center;
448+
margin-right: 13px !important;
449+
gap: 0.25rem;
448450
}
449-
450-
.tooltip-icon {
451-
width: 1rem;
452-
height: 1rem;
453-
display: inline-flex;
451+
.tooltip-container .btn-info-icon {
452+
display: flex;
454453
align-items: center;
455454
justify-content: center;
456-
border-radius: 50%;
457-
color: var(--c-white);
458-
background-color: var(--c-gray6);
459-
font-size: .75rem;
460-
line-height: 1.2;
455+
margin-left: 8px;
456+
min-width: 16px;
457+
min-height: 16px;
458+
width: 16px;
459+
height: 16px;
460+
line-height: 16px;
461+
color: #fff;
462+
position: relative;
461463
}
462-
463-
.tooltip-content {
464-
background-color: rgba(0, 0, 0, .7);
465-
color: var(--c-white);
466-
padding: .75rem;
467-
font-size: .75rem;
468-
line-height: 1.5;
469-
min-width: 8rem;
470-
max-width: 10rem;
471-
border-radius: .25rem;
464+
.tooltip-container .btn-info-icon:after {
465+
content: 'i';
466+
font-weight: 400;
467+
font-size: 12px;
468+
font-style: normal;
469+
left: 0;
470+
top: auto !important;
471+
height: 100%;
472+
}
473+
.tooltip-container .btn-info-icon .cp-tooltip {
474+
pointer-events: none;
475+
background-color: rgba(0, 0, 0, .80);
476+
color: #fff;
477+
padding: 8px;
478+
border-radius: 4px;
472479
position: absolute;
473-
top: 50%;
474-
transform: translateY(-50%);
475-
left: calc(100% + .5rem);
480+
left: calc(100% + 12px);
481+
cursor: auto;
482+
font-size: 12px;
483+
text-align: left;
484+
width: 225px;
476485
opacity: 0;
477-
pointer-events: none;
478-
transition: ease-in-out .2s;
479-
z-index: 3;
486+
transform: scale(.1);
487+
transition: opacity ease .1s, transform ease .1s;
488+
transform-origin: left;
489+
z-index: 100;
490+
font-weight: 400;
491+
line-height: 18px;
492+
font-family: 'Conv_apercu_regular','Helvetica','Sans-Serif','Arial';
493+
-webkit-text-stroke: 0;
494+
}
495+
.top-cp-tooltip {
496+
top: 0;
497+
}
498+
.bottom-cp-tooltip {
499+
bottom: 0;
500+
}
501+
.tooltip-container .btn-info-icon .cp-tooltip::before {
502+
content: "";
503+
position: absolute;
504+
top: 50%;
505+
left: -5px;
506+
transform: rotate(90deg) translate(-50%);
507+
margin-left: -5px;
508+
border-width: 5px;
509+
border-style: solid;
510+
border-color: rgba(0, 0, 0, .80) transparent transparent transparent;
480511
}
481-
482-
.bf-tooltip:hover .tooltip-content {
512+
.top-cp-tooltip::before {
513+
top: 10px !important;
514+
}
515+
.bottom-cp-tooltip::before {
516+
bottom: 0 !important;
517+
top: unset !important;
518+
}
519+
.tooltip-container .btn-info-icon:hover .cp-tooltip {
483520
opacity: 1;
521+
transform: scale(1);
522+
}
523+
524+
.draggable-list-view .d-item .copy{
525+
width: 70% !important;
526+
max-width: 70% !important;
484527
}
485528

486-
.bf-tooltip.tooltip-right .tooltip-content {
487-
left: auto;
488-
right: calc(100% + .5rem);
529+
.draggable-list-view.carousel-items .d-item span.title {
530+
width: 50% !important;
531+
max-width: 50% !important;
489532
}
490533

491-
.tooltip-content.to-bottom {
492-
top: 2rem;
534+
#rssFeedDialog .modal-body {
535+
overflow: auto;
536+
max-height: calc(90vh - 124px);
493537
}
494538

495-
.tooltip-content {
496-
min-width: 12rem;
539+
.slide {
540+
transform: none !important;
541+
-webkit-transform: none !important;
542+
}
543+
544+
#loader {
545+
border: 6px solid #f3f3f3;
546+
border-radius: 50%;
547+
border-top: 4px solid var(--c-primary);
548+
width: 30px;
549+
height: 30px;
550+
-webkit-animation: spin 1s linear infinite;
551+
animation: spin 1s linear infinite;
552+
}
553+
554+
.empty-state {
555+
min-height: 15rem;
556+
display: flex;
557+
align-items: center;
558+
justify-content: center;
559+
padding: 4rem;
560+
border-radius: 0.25rem;
561+
background-color: var(--c-gray1);
562+
border: 1px solid var(--c-gray3);
497563
}
498564

499-
.primary-bg {
500-
background-color: var(--c-primary);
565+
.empty-state h4 {
566+
color: var(--c-gray6);
567+
font-weight: 700;
568+
font-family: 'Conv_apercu_bold', 'Helvetica', 'Sans-Serif', 'Arial';
501569
}

control/content/assets/css/content.app.css

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,45 @@
5454

5555
.slide::-webkit-scrollbar{
5656
display: none;
57+
}
58+
59+
#carousel .item.clearfix .col-md-3 {
60+
width: calc(100% / 3);
61+
}
62+
63+
#carousel .item.clearfix .col-md-9 {
64+
width: calc(100% / 3*2);
65+
padding-left: 0;
66+
}
67+
68+
#carousel .item.clearfix .col-md-9 .clearfix {
69+
display: flex;
70+
justify-content: flex-end;
71+
}
72+
73+
#carousel .item.clearfix .col-md-9 .btn {
74+
float: right !important;
75+
color: #05acf0 !important;
76+
background-color: transparent !important;
77+
border: 1px solid var(--c-primary);
78+
padding: 7px 22px 7px 38px !important;
79+
}
80+
81+
#carousel .item.clearfix .col-md-9 .btn:hover {
82+
background-color: #f2f2f2 !important;
83+
}
84+
85+
#carousel .item.clearfix .col-md-9 .btn::before,
86+
#carousel .item.clearfix .col-md-9 .btn::after {
87+
background-color: var(--c-primary) !important;
88+
left: unset;
89+
right: 70%;
90+
}
91+
92+
.sortable-list-container {
93+
height: auto;
94+
}
95+
96+
#feeds {
97+
margin-bottom: 0;
5798
}

control/content/assets/css/subPage.css

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,46 @@
1-
.subPage {
1+
.subPage.activeDialog {
2+
background: #ffffffaa;
3+
bottom: 0;
4+
display: block;
5+
height: 100vh;
6+
position: fixed;
7+
right: 0;
8+
top: 0;
9+
width: 100vw;
10+
z-index: 999;
11+
}
12+
13+
.subPage>.subPageContent {
214
display: none;
3-
position: absolute;
15+
position: fixed;
416
top: 0px;
517
left: 0px;
618
background-color: white;
719
}
820

9-
.subPage.activeFull {
21+
.subPage.activeFull>.subPageContent {
1022
display: block;
1123
height: 100%;
1224
width: 100%;
1325
}
1426

15-
.subPage.activeDialog {
27+
.subPage.activeDialog>.subPageContent {
1628
display: block;
17-
width: 80%;
18-
left: 10%;
19-
top: 200px;
29+
width: 70%;
30+
top: 50%;
31+
left: 50%;
32+
transform: translate(-50%, -50%);
33+
overflow: auto;
34+
max-height: 90vh;
2035
box-shadow: grey 5px 5px 15px;
21-
outline: 9999px solid #ffffffaa;
22-
z-index: 999;
36+
z-index: 1000;
2337
}
2438

25-
.subPage>.spHeader {
39+
.subPage.activeDialog.loaderDialog>.subPageContent {
40+
width: 50%;
41+
}
42+
43+
.subPage>.subPageContent>.spHeader {
2644
display: flex;
2745
align-items: center;
2846
justify-content: space-between;
@@ -42,7 +60,7 @@
4260
font-size: 20px;
4361
}
4462

45-
.subPage>.spFooter {
63+
.subPage>.subPageContent>.spFooter {
4664
text-align: right;
4765
border-top: 1px solid #ddd !important;
4866
}
@@ -56,11 +74,6 @@
5674
color: red;
5775
}
5876

59-
.subPage>.modal-body>.form-group>label:after {
60-
content: " *";
61-
color: red;
62-
}
63-
6477
#rssErrorMessage, #googleErrorMessage {
6578
color: red;
6679
}

0 commit comments

Comments
 (0)