From 5a1a34610a68c430890588f44aa060a0a25d0647 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Tue, 4 Jun 2024 17:31:51 -0400 Subject: [PATCH] ribbon improvements --- examples/BasicApp.html | 23 ++++++++++++-- examples/images/attribute-16x16.png | Bin 0 -> 649 bytes examples/images/class-16x16.png | Bin 0 -> 488 bytes examples/images/class-32x32.png | Bin 0 -> 1028 bytes examples/images/relationship-16x16.png | Bin 0 -> 414 bytes examples/images/task-16x16.png | Bin 0 -> 720 bytes src/uwt-web/common/uwt-ribbon.less | 36 ++++++++++++++++++++-- src/uwt-web/themes/mso12/uwt-ribbon.less | 37 +++++++++++++++++++++++ 8 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 examples/images/attribute-16x16.png create mode 100644 examples/images/class-16x16.png create mode 100644 examples/images/class-32x32.png create mode 100644 examples/images/relationship-16x16.png create mode 100644 examples/images/task-16x16.png diff --git a/examples/BasicApp.html b/examples/BasicApp.html index 6a2e031..08099a6 100644 --- a/examples/BasicApp.html +++ b/examples/BasicApp.html @@ -17,9 +17,28 @@
- Test +
+ +
Class
+
+
+
+ +
Attribute
+
+
+ +
Relationship
+
+
+ +
Task
+
+
+
+
+ Create
-
Clipboard
diff --git a/examples/images/attribute-16x16.png b/examples/images/attribute-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..d4bf011c09d5519c432b2dff8786ac9f12d61e9f GIT binary patch literal 649 zcmV;40(Sk0P)>bqEfG zk{oSwv;_$(28!F)bDrtwv_k~a17F^Ym(S<>@WRV5|7%8u9-Wke;b#xQbKMxQnqjxx zgSE#b$HaM92)_#6R$W@9UZxeq=VFIFMAmV!6*Lm}9e9AKV~zAuC~Ggwb; z;nTOY1pg#h^d}1hG~5d>L7eakHiw&F3+F;FE276XkqP)1gM$m_O8(X&mJxM|LVoQ{|7fWqZsm~$P>SzKm#~-FNy#E{%+>YCl99q z4LSaQ#kAD_FwOsNU;O_zOqHM^EISt`{C|8c>i?5RbN}~bD1$XTYEb?EvpenozspDe z-w)QnZ-{ST*#CxfyZ?{x#{N(AHUld@?4|wxX^;}wkR@i~xDD_M2>XwX9cAk%3(^QO z1g8PmG^5iPnqeV}%VunR6wRQJeHX0o6DDTar2Sv7PVK*Xl@eALpa4+F{+f^r4_T1r z$=5sncbu*JpSd{&ZU|17U<+C8TIH|t>!be1uZ;fhKgajKOt~ajym;30|1gYV2)2-w zNtgNv#Q#AUrg{3lKmQjV`2D|Wk;;e)j+&$}{u;0000*@H-ul-9##FD13<1=e|VgVuIKsq^t!zNC7xGK!+=WEmyLnhIGjs#K0J!9#w>h%$zDfm z4XY(wLjIdBZBQ@^sQ$J`dfP~dYqlp9fVD6M*796@F_ryUiB0Q*^aK-N0Vg?e zPs@5g0--zSFs#OtuvW2?Fq>elEaDO_!&NK7@>rS(CM4u=8VzbsJW+almpB!NZaR&N zxqMy~;OUwG18-w#WbvlCkVw%EUoOA*nqnLm5E7r$V|b;xO9DOcrvffn4`XR#QAyV` zCVHri0V8cB#5LP zK2s{e>H(IzWPh)9LZZ)b@wuGdpvw3aJkJoIi6{v}XtE|kCM6^a2+lHs)(Pqa+_rJt z+pJjgD|n_wkF{siVDoU9#7>rOdM$Qgb_5(Y4uTUjw=omfIx7%gv&%+;LDei~mIXa0 z(f5YqsBy^Ql*;xpF0m|gK9|r&?}j*bR;M{7;iz#;+UtXrIZILSEE`uk%5mv^DbBYT zP~4ouC1xl3L$^01O8QLQF-?s2L^HJd6?%sPjvB|Hm2Qfm8;4-YsbFMT(s1rg9txVW zklm1uR7)aO7pu60cwT}*r6IWfvISIQvX^h~RiH18Lr5%44??U-ha={AB-ZZdnR>vV zBq4=oRyU&JaVK`=*Kmn_22Hp_2}g~CB*ttRjq!VYFefPxiqr*|9Os9@q3+P?ydvdr zO4-A9*CgzHyCgyXR+=fX-U`|ajJk>$5!aDzdWP~x9Vos39){W$ yAeWGa))wieME-RFsf0AXJ7y{R1^$0HGrj>;hPLB28nVU!0000?NMQuIw+^SVY;i&wq?x0u&N2 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvNA9*a(lWshE&W+PEZgkSzq;af9A>4|Cer#|KmUV$DjI&-ey>0MYX1N3XSKicXH-oyVHVJ<_-4=Zf@yl!?<3M1YHrW`f8xRM z_4WUKZ72U1{u1qQk?q}rNo!XcFn^QT|FQn&vBUr4>wk3{FwDNM^tyjDlPP;k*t@^! z!eReY-^~Kr@aHf4l^@Ul_p0yzC%^Nf>}+mCym;yt2_pGDG_%9v-1(&C*pUXO@ GgeCxa2DJ15 literal 0 HcmV?d00001 diff --git a/examples/images/task-16x16.png b/examples/images/task-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..552501d03e92745c082c007700fad10641d06b2c GIT binary patch literal 720 zcmV;>0x$iEP)Le9R?DW#E$7;vwdv;G=k}bd z^PH{Oa37)`_`$=0>vx}X-6GfU6jl|_8BVzdjy^SP-Q!r1Jiz-lC6=!!@VapTug>>j z?wky!vr@)vtptXe8xRQsui-7jGyMkNUM#|`F~g-Y;p>30P&1 z87p0npgh!26fB(SVVLV=n5*rEv8D_9(;d*AYKQiu7?USjp*nsQ%{vepQc>hii+9mMs5O~7`ZjP{URl$A-Gid8op}Av( z35sWWdZtDT?Vv$CP$?Kyn@aB|$Q6Wj5w@@;Zg@{9w5@BR>D z-OIu0=3sM$@XpC$(aypAfy1n&k_v(F^RI~h_xlC=F7%6j6(Z080000 div.uwt-title { @@ -184,8 +197,24 @@ div.uwt-ribbon &.uwt-orientation-vertical > .uwt-ribbon-command { - &> img { display: inline-block; } - &> div.uwt-title { display: inline-block; text-align: left; } + padding-left: 24px; + &> img + { + display: inline-block; + margin-left: -24px; + margin-top: 0px; + } + &> div.uwt-title + { + display: inline-block; + text-align: left; + margin-left: 24px; + top: 0px; + } + &.uwt-button + { + min-height: 28px; + } } } } @@ -196,6 +225,9 @@ div.uwt-ribbon left: 0px; right: 0px; text-align: center; + + padding: 2px; + font-size: 0.8em; } } } diff --git a/src/uwt-web/themes/mso12/uwt-ribbon.less b/src/uwt-web/themes/mso12/uwt-ribbon.less index f10c4ca..052e248 100644 --- a/src/uwt-web/themes/mso12/uwt-ribbon.less +++ b/src/uwt-web/themes/mso12/uwt-ribbon.less @@ -62,6 +62,43 @@ div.uwt-ribbon &> div.uwt-ribbon-tab-content { background: linear-gradient(to bottom, #dbe6f4 0%, #cfddef 40%, #c9d9ed 41%, #e7f2ff 100%); + + &> div.uwt-ribbon-tab-group + { + border: 1px solid #9ebfdb; + border-top-color: #c5d2df; + &> div.uwt-title + { + background: linear-gradient(to bottom, #c2d8f1 0%, #c0d8ef 100%); + color: #3e6aaa; + } + + &:hover + { + background: linear-gradient(to bottom, #e4effd 0%, #e8f0fc 40%, #dceafb 41%, #dce8f8 100%); + &> div.uwt-title + { + background: linear-gradient(to bottom, #c8e0ff 0%, #d6edff 100%); + } + } + + &> div.uwt-content + { + div.uwt-ribbon-command + { + &.uwt-button + { + border: 1px solid transparent; + &:hover + { + background: linear-gradient(to bottom, #fffdec 0%, #ffedb3 50%, #ffda6e 51%, #ffe9a4 100%); + border-color: #dbce99; + border-bottom-color: #cbc3aa; + } + } + } + } + } } } } \ No newline at end of file