diff --git a/resources/assets/icons/copy.svg b/resources/assets/icons/copy.svg index 45e34a39b..3a52e2314 100644 --- a/resources/assets/icons/copy.svg +++ b/resources/assets/icons/copy.svg @@ -1,4 +1,3 @@ - \ No newline at end of file diff --git a/resources/assets/icons/link.svg b/resources/assets/icons/link.svg index 94eea0ed8..3e8be1ce7 100644 --- a/resources/assets/icons/link.svg +++ b/resources/assets/icons/link.svg @@ -1,4 +1,3 @@ - \ No newline at end of file diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss index c58f6ef47..39e93f5b1 100755 --- a/resources/assets/sass/_pages.scss +++ b/resources/assets/sass/_pages.scss @@ -141,10 +141,12 @@ } .pointer { border: 1px solid #CCC; - display: inline-block; + display: flex; + align-items: center; + justify-items: center; padding: $-s $-s; border-radius: 4px; - box-shadow: 0 0 8px 1px rgba(212, 209, 209, 0.35); + box-shadow: 0 0 12px 1px rgba(212, 209, 209, 0.3); position: absolute; top: -60px; background-color:#FFF; @@ -171,13 +173,6 @@ border-right: 1px solid #CCC; z-index: 56; } - input { - background-color: #FFF; - border: 1px solid #DDD; - color: #666; - width: 172px; - z-index: 40; - } input, button, a { position: relative; border-radius: 0; @@ -186,14 +181,20 @@ vertical-align: top; padding: 5px 16px; } - > i { - color: #888; - font-size: 18px; - padding-top: 4px; + input { + background-color: #FFF; + border: 1px solid #DDD; + color: #666; + width: 172px; + z-index: 40; + padding: 5px 10px; } span.icon { + fill: #444; cursor: pointer; user-select: none; + display: inline-block; + line-height: 1; } .input-group .button { line-height: 1; @@ -201,11 +202,8 @@ box-shadow: none; } a.button { - margin: 0 0 0 0; - - &:hover { - fill: #fff; - } + margin: 0; + color: #FFF; } .svg-icon { width: 1.2em; diff --git a/resources/views/pages/pointer.blade.php b/resources/views/pages/pointer.blade.php new file mode 100644 index 000000000..d4aca5dda --- /dev/null +++ b/resources/views/pages/pointer.blade.php @@ -0,0 +1,13 @@ +
+
+ @icon('link') @icon('include', ['style' => 'display:none;']) +
+ + +
+ @if(userCan('page-update', $page)) + @icon('edit') + @endif +
+
\ No newline at end of file diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php index ff4db2eec..0ae3fa5b6 100644 --- a/resources/views/pages/show.blade.php +++ b/resources/views/pages/show.blade.php @@ -11,22 +11,8 @@
-
- -
-
- @icon('link') @icon('include', ['style' => 'display:none;']) - - - - - @if(userCan('page-update', $page)) - @icon('edit') - @endif -
-
- +
+ @include('pages.pointer', ['page' => $page]) @include('pages.page-display')