From d1f85525d092dae5091e21a9fae142afdcc7d15e Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Mon, 16 Oct 2023 00:24:20 +0000 Subject: [PATCH 1/2] [skip ci] Updated licenses and gitignores --- options/license/BSD-3-Clause-flex | 42 ++++++++++++++++++++++++++ options/license/GCC-exception-2.0-note | 16 ++++++++++ 2 files changed, 58 insertions(+) create mode 100644 options/license/BSD-3-Clause-flex create mode 100644 options/license/GCC-exception-2.0-note diff --git a/options/license/BSD-3-Clause-flex b/options/license/BSD-3-Clause-flex new file mode 100644 index 0000000000..684b011026 --- /dev/null +++ b/options/license/BSD-3-Clause-flex @@ -0,0 +1,42 @@ +Flex carries the copyright used for BSD software, slightly modified +because it originated at the Lawrence Berkeley (not Livermore!) Laboratory, +which operates under a contract with the Department of Energy: + +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The Flex Project. + +Copyright (c) 1990, 1997 The Regents of the University of California. +All rights reserved. + +This code is derived from software contributed to Berkeley by +Vern Paxson. + +The United States Government has rights in this work pursuant +to contract no. DE-AC03-76SF00098 between the United States +Department of Energy and the University of California. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +Neither the name of the University nor the names of its contributors +may be used to endorse or promote products derived from this software +without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. + +This basically says "do whatever you please with this software except +remove this notice or take advantage of the University's (or the flex +authors') name". + +Note that the "flex.skl" scanner skeleton carries no copyright notice. +You are free to do whatever you please with scanners generated using flex; +for them, you are not even bound by the above copyright. diff --git a/options/license/GCC-exception-2.0-note b/options/license/GCC-exception-2.0-note new file mode 100644 index 0000000000..654099aac0 --- /dev/null +++ b/options/license/GCC-exception-2.0-note @@ -0,0 +1,16 @@ + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. From 6c501b149809a7015e58d9627e84bfd593702f95 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 16 Oct 2023 15:26:08 +0800 Subject: [PATCH 2/2] Improve dropdown button alignment and fix hover bug (#27632) 1. fix #27631 , and add samples to devtest page 2. fix incorrect color for "ui dropdown button" when hover --- templates/devtest/gitea-ui.tmpl | 9 +++++++++ web_src/css/base.css | 2 +- web_src/css/modules/button.css | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index fa74ed7ce6..73293ddf48 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -250,6 +250,15 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+
Button align with ...
+
+ ... Dropdown Button + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+
diff --git a/web_src/css/base.css b/web_src/css/base.css index 9661cdecad..0cfd311158 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1952,7 +1952,7 @@ table th[data-sortt-desc] .svg { height: 15px; } -.ui.dropdown { +.ui.dropdown:not(.button) { line-height: var(--line-height-default); /* the dropdown doesn't have default line-height, use this to make the dropdown icon align with plain dropdown */ } diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index 0d30249c9c..36cb499aeb 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -128,11 +128,13 @@ It needs some tricks to tweak the left/right borders with active state */ .ui.primary.button:focus, .ui.primary.buttons .button:focus { background: var(--color-primary); + color: var(--color-primary-contrast); } .ui.primary.button:hover, .ui.primary.buttons .button:hover { background: var(--color-primary-hover); + color: var(--color-primary-contrast); } .ui.primary.button:active,